From 7acaebcb01438578ded72491f39105db893982ef Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期二, 01 七月 2025 16:21:32 +0800
Subject: [PATCH] 修改

---
 multi-system/src/main/resources/mapper/system/CompanyIndustryTemplateMapper.xml |   41 +++++++++++++++++++++++++----------------
 1 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/multi-system/src/main/resources/mapper/system/CompanyIndustryTemplateMapper.xml b/multi-system/src/main/resources/mapper/system/CompanyIndustryTemplateMapper.xml
index 5dd47f1..a8011e9 100644
--- a/multi-system/src/main/resources/mapper/system/CompanyIndustryTemplateMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/CompanyIndustryTemplateMapper.xml
@@ -19,6 +19,9 @@
             <if test="filePath != null and filePath !=''" >
                 file_path = #{filePath},
             </if>
+            <if test="fileName != null and fileName !=''" >
+                file_name = #{fileName},
+            </if>
             <if test="format != null and format !=''" >
                 format = #{format},
             </if>
@@ -43,26 +46,32 @@
 
     <select id="selectCompanyIndustryTemplateList" resultType="com.gkhy.exam.system.domain.CompanyIndustryTemplate">
         SELECT
-            `id`,
-            `company_id`,
-            `company_name`,
-            `template_name`,
-            `industry_type`,
-            `file_path`,
-            `format`,
-            `del_flag`,
-            `create_by`,
-            `create_time`,
-            `update_by`,
-            `update_time`
+            ci.`id`,
+            ci.`company_id`,
+            ci.`company_name`,
+            ci.`template_name`,
+            ci.`industry_type`,
+            cit.name as industry_name,
+            ci.`file_path`,
+            ci.`file_name`,
+            ci.`format`,
+            ci.`del_flag`,
+            ci.`create_by`,
+            ci.`create_time`,
+            ci.`update_by`,
+            ci.`update_time`
         FROM
-        company_industry_template
+        company_industry_template ci
+        left join company_industry_type cit on ci.industry_type = cit.id
         WHERE
-            del_flag = 0
+            ci.del_flag = 0
         <if test="companyId!=null and companyId!=''">
-            and company_id = #{companyId}
+            and ci.company_id = #{companyId}
+        </if>
+        <if test="industryType!=null">
+            and ci.industry_type = #{industryType}
         </if>
         ORDER BY
-            create_time DESC
+            ci.create_time DESC
     </select>
 </mapper>

--
Gitblit v1.9.2