diff --git a/bonus-admin/src/main/java/com/bonus/web/service/enterprise/FinanceService.java b/bonus-admin/src/main/java/com/bonus/web/service/enterprise/FinanceService.java index 33ecca7..b31addf 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/enterprise/FinanceService.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/enterprise/FinanceService.java @@ -102,9 +102,9 @@ public class FinanceService { try { // 2. 校验文件名称唯一性 -// if (!imdFinanceService.checkFileNameUnique(addDto)) { -// return AjaxResult.error("同一企业下文件名称已存在,请更换"); -// } + if (!imdFinanceService.checkFileNameUnique(addDto)) { + return AjaxResult.error("同一企业下文件名称已存在,请更换"); + } // 3. 调用内层Service新增财务信息(操作类型1=新增,与业绩模块枚举逻辑一致) int rows = imdFinanceService.operFinanceData(addDto, 1); if (rows <= 0) { diff --git a/bonus-mainDatabase/src/main/resources/mapper/QualificationMapper.xml b/bonus-mainDatabase/src/main/resources/mapper/QualificationMapper.xml index 45d7e0e..5cb31cd 100644 --- a/bonus-mainDatabase/src/main/resources/mapper/QualificationMapper.xml +++ b/bonus-mainDatabase/src/main/resources/mapper/QualificationMapper.xml @@ -113,7 +113,7 @@ certificate_end_date = #{params.certificateEndDate}, - + certificate_institution = #{params.certificateInstitution}, diff --git a/bonus-template/src/main/resources/mapper/IMDTemplateCompositionMapper.xml b/bonus-template/src/main/resources/mapper/IMDTemplateCompositionMapper.xml index 845950a..8edc957 100644 --- a/bonus-template/src/main/resources/mapper/IMDTemplateCompositionMapper.xml +++ b/bonus-template/src/main/resources/mapper/IMDTemplateCompositionMapper.xml @@ -19,16 +19,12 @@ tb.composition_id, tb.template_id, tb.composition_type, tb.file_name, tb.file_type from tb_template_composition tb - left join tb_template_composition comp - on tb.template_id = comp.template_id - where tb.del_flag = '0'