From a2e46f04a0af67b0dde7bc9529eb7f6b8d4ee224 Mon Sep 17 00:00:00 2001
From: LHD_HY <2872546851@qq.com>
Date: Wed, 26 Nov 2025 18:00:01 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/web/service/enterprise/FinanceService.java    | 6 +++---
 .../src/main/resources/mapper/QualificationMapper.xml       | 2 +-
 .../main/resources/mapper/IMDTemplateCompositionMapper.xml  | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

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 @@
                     <if test="params.certificateEndDate != null">
                         certificate_end_date = #{params.certificateEndDate},
                     </if>
-                    <if test="params.certificateInstitution != null and params.certificateInstitution != ''">
+                    <if test="params.certificateInstitution != null">
                         certificate_institution = #{params.certificateInstitution},
                     </if>
                     <if test="params.qualificationType != null and params.qualificationType != ''">
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'
     </sql>
 
     <!-- 1. 根据模板ID查询组成记录 -->
     <select id="selectByTemplateId" parameterType="Long" resultMap="templateCompositionResult">
         <include refid="selectTemplateComposition"/>
         where template_id = #{templateId}
-
     </select>
 
     <!-- 2. 新增模板组成记录 -->