Merge remote-tracking branch 'origin/master'

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)) {
+            if (!imdFinanceService.checkFileNameUnique(addDto)) {
-//                return AjaxResult.error("同一企业下文件名称已存在，请更换");
+                return AjaxResult.error("同一企业下文件名称已存在，请更换");
-//            }
+            }
             // 3. 调用内层Service新增财务信息（操作类型1=新增，与业绩模块枚举逻辑一致）
             int rows = imdFinanceService.operFinanceData(addDto, 1);
             if (rows <= 0) {

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 != ''">

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. 新增模板组成记录 -->