Skip to content

Commit 41ba7ad

Browse files
pixelmaxQmpixelmaxQm
committed
fix: #1918 在包含delete_at的情况下，数据源自动过滤软删除数据
1 parent 3452eaf commit 41ba7ad

File tree

6 files changed

+46
-21
lines changed

6 files changed

+46
-21
lines changed

‎server/model/system/request/sys_auto_code.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,12 @@ type AutoCode struct {
4646
}
4747

4848
type DataSource struct {
49-
DBName string `json:"dbName"`
50-
Table string `json:"table"`
51-
Label string `json:"label"`
52-
Value string `json:"value"`
53-
Association int `json:"association"` // 关联关系 1 一对一 2 一对多
49+
DBName string `json:"dbName"`
50+
Table string `json:"table"`
51+
Label string `json:"label"`
52+
Value string `json:"value"`
53+
Association int `json:"association"` // 关联关系 1 一对一 2 一对多
54+
HasDeletedAt bool `json:"hasDeletedAt"`
5455
}
5556

5657
func (r *AutoCode) Apis() []model.SysApi {

‎server/resource/package/server/service/service.go.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ orderMap["{{.ColumnName}}"] = true
4949
{{- else}}
5050
{{ $dataDB = printf "global.MustGetGlobalDBByDBName(\"%s\")" $value.DBName }}
5151
{{- end}}
52-
{{$dataDB}}.Table("{{$value.Table}}").Select("{{$value.Label}} as label,{{$value.Value}} as value").Scan(&{{$key}})
52+
{{$dataDB}}.Table("{{$value.Table}}"){{- if $value.HasDeletedAt}}.Where("deleted_at IS NOT NULL"){{ end }}.Select("{{$value.Label}} as label,{{$value.Value}} as value").Scan(&{{$key}})
5353
res["{{$key}}"] = {{$key}}
5454
{{- end }}
5555
{{- end }}
@@ -204,7 +204,7 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}DataSou
204204
{{- else}}
205205
{{ $dataDB = printf "global.MustGetGlobalDBByDBName(\"%s\")" $value.DBName }}
206206
{{- end}}
207-
{{$dataDB}}.Table("{{$value.Table}}").Select("{{$value.Label}} as label,{{$value.Value}} as value").Scan(&{{$key}})
207+
{{$dataDB}}.Table("{{$value.Table}}"){{- if $value.HasDeletedAt}}.Where("deleted_at IS NOT NULL"){{ end }}.Select("{{$value.Label}} as label,{{$value.Value}} as value").Scan(&{{$key}})
208208
res["{{$key}}"] = {{$key}}
209209
{{- end }}
210210
return

‎server/resource/plugin/server/service/service.go.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ orderMap["{{.ColumnName}}"] = true
4949
{{- else}}
5050
{{ $dataDB = printf "global.MustGetGlobalDBByDBName(\"%s\")" $value.DBName }}
5151
{{- end}}
52-
{{$dataDB}}.Table("{{$value.Table}}").Select("{{$value.Label}} as label,{{$value.Value}} as value").Scan(&{{$key}})
52+
{{$dataDB}}.Table("{{$value.Table}}"){{- if $value.HasDeletedAt}}.Where("deleted_at IS NOT NULL"){{ end }}.Select("{{$value.Label}} as label,{{$value.Value}} as value").Scan(&{{$key}})
5353
res["{{$key}}"] = {{$key}}
5454
{{- end }}
5555
{{- end }}
@@ -211,7 +211,7 @@ func (s *{{.Abbreviation}})Get{{.StructName}}DataSource() (res map[string][]map[
211211
{{- else}}
212212
{{ $dataDB = printf "global.MustGetGlobalDBByDBName(\"%s\")" $value.DBName }}
213213
{{- end}}
214-
{{$dataDB}}.Table("{{$value.Table}}").Select("{{$value.Label}} as label,{{$value.Value}} as value").Scan(&{{$key}})
214+
{{$dataDB}}.Table("{{$value.Table}}"){{- if $value.HasDeletedAt}}.Where("deleted_at IS NOT NULL"){{ end }}.Select("{{$value.Label}} as label,{{$value.Value}} as value").Scan(&{{$key}})
215215
res["{{$key}}"] = {{$key}}
216216
{{- end }}
217217
return

‎server/service/system/auto_code_package.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,13 @@ func (s *autoCodePackage) All(ctx context.Context) (entities []model.SysAutoCode
131131
}
132132
for i := 0; i < len(serverDir); i++ {
133133
if serverDir[i].IsDir() {
134-
serverPackage := model.SysAutoCodePackage{PackageName: serverDir[i].Name(), Template: "package", Label: serverDir[i].Name() + "包", Desc: "系统自动读取" + serverDir[i].Name() + "包"}
134+
serverPackage := model.SysAutoCodePackage{
135+
PackageName: serverDir[i].Name(),
136+
Template: "package",
137+
Label: serverDir[i].Name() + "包",
138+
Desc: "系统自动读取" + serverDir[i].Name() + "包",
139+
Module: global.GVA_CONFIG.AutoCode.Module,
140+
}
135141
server = append(server, serverPackage)
136142
}
137143
}
@@ -161,7 +167,13 @@ func (s *autoCodePackage) All(ctx context.Context) (entities []model.SysAutoCode
161167
if len(dirNameMap) != 0 {
162168
continue
163169
}
164-
pluginPackage := model.SysAutoCodePackage{PackageName: pluginDir[i].Name(), Template: "plugin", Label: pluginDir[i].Name() + "插件", Desc: "系统自动读取" + pluginDir[i].Name() + "插件，使用前请确认是否为v2版本插件"}
170+
pluginPackage := model.SysAutoCodePackage{
171+
PackageName: pluginDir[i].Name(),
172+
Template: "plugin",
173+
Label: pluginDir[i].Name() + "插件",
174+
Desc: "系统自动读取" + pluginDir[i].Name() + "插件，使用前请确认是否为v2版本插件",
175+
Module: global.GVA_CONFIG.AutoCode.Module,
176+
}
165177
plugin = append(plugin, pluginPackage)
166178
}
167179
}

‎web/src/view/systemTools/autoCode/component/fieldDialog.vue

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,7 @@ const getDBTableList = async () => {
457457
458458
const dbColumnList = ref([])
459459
const selectDB = async (val,isInit) => {
460+
middleDate.value.dataSource.hasDeletedAt = false
460461
middleDate.value.dataSource.table = val
461462
const res = await getColumn({
462463
businessDB: middleDate.value.dataSource.dbName,
@@ -465,13 +466,18 @@ const selectDB = async (val,isInit) => {
465466
466467
if (res.code === 0) {
467468
let list = res.data.columns; // 确保这里正确获取到 tables 数组
468-
dbColumnList.value = list.map(item => ({
469-
columnName: item.columnName,
470-
value: item.columnName,
471-
type: item.dataType,
472-
isPrimary: item.primaryKey,
473-
comment: item.columnComment
474-
}));
469+
dbColumnList.value = list.map(item => {
470+
if(item.columnName === 'deleted_at'){
471+
middleDate.value.dataSource.hasDeletedAt = true
472+
}
473+
return{
474+
columnName: item.columnName,
475+
value: item.columnName,
476+
type: item.dataType,
477+
isPrimary: item.primaryKey,
478+
comment: item.columnComment
479+
}
480+
});
475481
if (dbColumnList.value.length > 0 && !isInit) {
476482
middleDate.value.dataSource.label = dbColumnList.value[0].columnName
477483
middleDate.value.dataSource.value = dbColumnList.value[0].columnName

‎web/src/view/systemTools/autoCode/index.vue

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,10 +1020,12 @@ const fieldTemplate = {
10201020
fieldIndexType: '',
10211021
dictType: '',
10221022
dataSource: {
1023+
dbName: '',
10231024
association:1,
10241025
table: '',
10251026
label: '',
1026-
value: ''
1027+
value: '',
1028+
hasDeletedAt: false
10271029
}
10281030
}
10291031
const route = useRoute()
@@ -1116,10 +1118,12 @@ const editAndAddField = (item) => {
11161118
addFlag.value = 'edit'
11171119
if(!item.dataSource){
11181120
item.dataSource = {
1121+
dbName: '',
11191122
association:1,
11201123
table: '',
11211124
label: '',
1122-
value: ''
1125+
value: '',
1126+
hasDeletedAt: false
11231127
}
11241128
}
11251129
bk.value = JSON.parse(JSON.stringify(item))
@@ -1344,10 +1348,12 @@ const getColumnFunc = async() => {
13441348
excel: false,
13451349
desc: true,
13461350
dataSource: {
1351+
dbName: '',
13471352
association:1,
13481353
table: '',
13491354
label: '',
1350-
value: ''
1355+
value: '',
1356+
hasDeletedAt: false
13511357
}
13521358
})
13531359
}

0 commit comments

Comments
 (0)