瀏覽代碼

修改BUG 配置的是两款基础款的 一款是A区 一款B区 这个不显示无法区分

lixiaolong 1 月之前
父節點
當前提交
c69dae7d47

+ 4 - 1
platform/src/main/resources/mapper/JyxConfigMapper.xml

@@ -39,7 +39,9 @@
 
 
     <sql id="params">
-        jc.`id`, jc.`product_type`,jc.`parent_id`, jc.`product_name`,jc.`alias`,jc.`company`, jc.`product_code`,jc.`connection_method`,jc.`premium_setting`, jc.`coverage` as jsCoverage, jc.`premium` as jsPremium, jc.`system_code`, jc.`is_delete` as isDelete
+        jc.`id`, jc.`product_type`,jc.`parent_id`,
+        CASE WHEN jc.parent_id != '0' AND jc.parent_id IS NOT NULL AND jc1.product_name IS NOT NULL THEN CONCAT(jc1.product_name, '-', jc.product_name) ELSE jc.product_name END as product_name,
+        jc.`alias`,jc.`company`, jc.`product_code`,jc.`connection_method`,jc.`premium_setting`, jc.`coverage` as jsCoverage, jc.`premium` as jsPremium, jc.`system_code`, jc.`is_delete` as isDelete
     </sql>
 
     <select id="jyxList" resultMap="jyxConfigVo">
@@ -48,6 +50,7 @@
         jb.id as blame_id,jb.blame,jb.blame_code,jb.blame_coverage,jb.blame_premium,jb.system_code as blame_system_code,jb.jyx_config_id as blame_jyx_config_id,
         js.id as setting_id,js.seats,js.coverage as setting_coverage,js.premium as setting_premium,js.system_code as setting_system_code,js.jyx_config_id as setting_jyx_config_id
         from jyx_config jc
+        left join jyx_config jc1 on jc.parent_id = jc1.id AND jc1.is_delete = 0
         left join jyx_blame jb on jc.id = jb.jyx_config_id AND jb.is_delete = 0
         left join jyx_setting js on jc.id = js.jyx_config_id AND js.is_delete = 0
         <where>

+ 1 - 1
tenant/organization/src/main/resources/mapper/PtlSchemeMapper.xml

@@ -173,7 +173,7 @@
             psi.scheme_type,
             psi.scheme_name,
             jc.id as jc_id,
-            jc.product_name,
+            CASE WHEN jc.parent_id != '0' AND jc.parent_id IS NOT NULL AND jc1.product_name IS NOT NULL THEN CONCAT(jc1.product_name, '-', jc.product_name) ELSE jc.product_name END as product_name,
             jc.alias,
             jc.product_code,
             jc.coverage,