feat: 添加软删除过滤

Author: piexlMax(奇淼

Diff for: server/resource/package/web/view/table.vue.tpl

@@ -138,7 +138,7 @@ getDataSourceFunc()
             <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.batchDelete"{{ end }} icon="delete" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="onDelete">删除</el-button>
             {{ if .HasExcel -}}
             <ExportTemplate {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.exportTemplate"{{ end }} template-id="{{$templateID}}" />
-            <ExportExcel {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.exportExcel"{{ end }} template-id="{{$templateID}}" />
+            <ExportExcel {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.exportExcel"{{ end }} template-id="{{$templateID}}" filterDeleted/>
             <ImportExcel {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.importExcel"{{ end }} template-id="{{$templateID}}" @on-success="getTableData" />
             {{- end }}
         </div>

Diff for: server/resource/plugin/web/view/view.vue.tpl

@@ -136,7 +136,7 @@ getDataSourceFunc()
             <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.batchDelete"{{ end }} icon="delete" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="onDelete">删除</el-button>
             {{ if .HasExcel -}}
             <ExportTemplate {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.exportTemplate"{{ end }} template-id="{{$templateID}}" />
-            <ExportExcel {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.exportExcel"{{ end }} template-id="{{$templateID}}" />
+            <ExportExcel {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.exportExcel"{{ end }} template-id="{{$templateID}}" filterDeleted/>
             <ImportExcel {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.importExcel"{{ end }} template-id="{{$templateID}}" @on-success="getTableData" />
             {{- end }}
         </div>

Diff for: server/service/system/sys_export_template.go

@@ -175,6 +175,29 @@ func (sysExportTemplateService *SysExportTemplateService) ExportExcel(templateID
 
 	db = db.Select(selects).Table(template.TableName)
 
+	filterDeleted := false
+
+	filterParam := values.Get("filterDeleted")
+	if filterParam == "true" {
+		filterDeleted = true
+	}
+
+	if filterDeleted {
+		// 自动过滤主表的软删除
+		db = db.Where(fmt.Sprintf("%s.deleted_at IS NULL", template.TableName))
+
+		// 过滤关联表的软删除(如果有)
+		if len(template.JoinTemplate) > 0 {
+			for _, join := range template.JoinTemplate {
+				// 检查关联表是否有deleted_at字段
+				hasDeletedAt := sysExportTemplateService.hasDeletedAtColumn(join.Table)
+				if hasDeletedAt {
+					db = db.Where(fmt.Sprintf("%s.deleted_at IS NULL", join.Table))
+				}
+			}
+		}
+	}
+
 	if len(template.Conditions) > 0 {
 		for _, condition := range template.Conditions {
 			sql := fmt.Sprintf("%s %s ?", condition.Column, condition.Operator)
@@ -344,6 +367,13 @@ func (sysExportTemplateService *SysExportTemplateService) ExportTemplate(templat
 	return file, template.Name, nil
 }
 
+// 辅助函数：检查表是否有deleted_at列
+func (s *SysExportTemplateService) hasDeletedAtColumn(tableName string) bool {
+	var count int64
+	global.GVA_DB.Raw("SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = ? AND COLUMN_NAME = 'deleted_at'", tableName).Count(&count)
+	return count > 0
+}
+
 // ImportExcel 导入Excel
 // Author [piexlmax](https://github.com/piexlmax)
 func (sysExportTemplateService *SysExportTemplateService) ImportExcel(templateID string, file *multipart.FileHeader) (err error) {

Diff for: web/src/components/exportExcel/exportExcel.vue

@@ -9,6 +9,10 @@
 import { exportExcel } from '@/api/exportTemplate'
 
   const props = defineProps({
+    filterDeleted: {
+      type: Boolean,
+      default: true
+    },
     templateId: {
       type: String,
       required: true
@@ -43,6 +47,11 @@ import { exportExcel } from '@/api/exportTemplate'
       baseUrl = ""
     }
     const paramsCopy = JSON.parse(JSON.stringify(props.condition))
+
+    if (props.filterDeleted) {
+      paramsCopy.filterDeleted = 'true'
+    }
+
     if (props.limit) {
       paramsCopy.limit = props.limit
     }