去重

simulation-resource-server/src/main/resources/mapper/scene/SystemScenePackageMapper.xml

@@ -60,12 +60,12 @@
 
     <select id="queryPackageByUserIdList" parameterType="api.common.pojo.param.scene.SystemScenePackageParam"
             resultType="api.common.pojo.vo.scene.SystemScenePackageVO">
-        select a.*,GROUP_CONCAT(DISTINCT(p.package_name)) as package_name from (select u.id user_id,u.is_deleted  ,username userName, company,s.package_id,s.modify_time
+        select a.*,GROUP_CONCAT(DISTINCT(p.package_name)) as package_name from (select u.id user_id,s.is_deleted  ,username userName, company,s.package_id,s.modify_time
         from system_user  u left join system_user_scene s
         on u.id=s.user_id where u.is_deleted = '0'  and  u.role_code ='2') a
-        left join system_scene_package p on a.package_id = p.id AND p.is_deleted = '0'
+        left join system_scene_package p on a.package_id = p.id AND p.is_deleted = '0' and a.is_deleted='0'
         <where>
-            a.is_deleted='0'
+            1=1
             <if test="userName != null and userName != ''">
                 and a.userName  like  CONCAT('%',#{userName,jdbcType=VARCHAR},'%')
             </if>
@@ -186,7 +186,7 @@
 
     <select id="querySceneNaturalListByTJ" parameterType="api.common.pojo.param.scene.SystemScenePackageParam"
             resultType="java.lang.String">
-        select a.scene_name
+        select DISTINCT(a.scene_name) scene_name
         FROM system_scene_package_sublist a join  scene_natural s on a.scene_name=s.natural_name join system_scene_package b on a.scene_and_package=b.id
         where
             a.is_deleted='0' and s.is_deleted='0' and b.is_deleted='0' and a.scene_type='1'
@@ -195,10 +195,11 @@
                  separator="," open="(" close=")">
             #{item}
         </foreach>
+
     </select>
     <select id="querySceneStandardsRegulationsListByTJ" parameterType="api.common.pojo.param.scene.SystemScenePackageParam"
             resultType="java.lang.String">
-        select a.scene_name
+        select DISTINCT(a.scene_name) scene_name
         FROM system_scene_package_sublist a join  scene_standards_regulations s on a.scene_name=s.scene_name join system_scene_package b on a.scene_and_package=b.id
         where
         a.is_deleted='0' and s.is_deleted='0' and b.is_deleted='0' and a.scene_type='2'
@@ -211,7 +212,7 @@
 
     <select id="querySceneAccidentListByTJ" parameterType="api.common.pojo.param.scene.SystemScenePackageParam"
             resultType="java.lang.String">
-        select a.scene_name
+        select DISTINCT(a.scene_name) scene_name
         FROM system_scene_package_sublist a join  scene_accident s on a.scene_name=s.scene_name join system_scene_package b on a.scene_and_package=b.id
         where
         a.is_deleted='0' and s.is_deleted='0' and b.is_deleted='0' and a.scene_type='3'
@@ -224,7 +225,7 @@
 
     <select id="querySceneGeneralTemplateListByTJ" parameterType="api.common.pojo.param.scene.SystemScenePackageParam"
             resultType="java.lang.String">
-        select a.scene_name
+        select DISTINCT(a.scene_name) scene_name
         FROM system_scene_package_sublist a join  scene_general_template s on a.scene_name=s.scene_id join system_scene_package b on a.scene_and_package=b.id
         where
         a.is_deleted='0' and s.is_deleted='0' and b.is_deleted='0' and a.scene_type='4'

simulation-resource-server/src/main/resources/mapper/scene/SystemScenePackageSublistMapper.xml

@@ -17,27 +17,27 @@
 
     <select id="querySceneNaturalList" parameterType="api.common.pojo.po.scene.SystemScenePackageSublistPO"
             resultType="java.lang.String">
-        select a.scene_name
+        select  DISTINCT(a.scene_name) scene_name
         FROM system_scene_package_sublist a join  scene_natural s on a.scene_name=s.natural_name where
             a.is_deleted='0' and s.is_deleted='0' and a.scene_and_package =#{sceneAndPackage} and a.scene_type =#{sceneType}
     </select>
     <select id="querySceneStandardsRegulationsList" parameterType="api.common.pojo.po.scene.SystemScenePackageSublistPO"
             resultType="java.lang.String">
-        select a.scene_name
+        select  DISTINCT(a.scene_name) scene_name
         FROM system_scene_package_sublist a join  scene_standards_regulations s on a.scene_name=s.scene_name where
             a.is_deleted='0' and s.is_deleted='0' and a.scene_and_package =#{sceneAndPackage} and a.scene_type =#{sceneType}
     </select>
 
     <select id="querySceneAccidentList" parameterType="api.common.pojo.po.scene.SystemScenePackageSublistPO"
             resultType="java.lang.String">
-        select a.scene_name
+        select  DISTINCT(a.scene_name) scene_name
         FROM system_scene_package_sublist a join  scene_accident s on a.scene_name=s.scene_name where
             a.is_deleted='0' and s.is_deleted='0' and a.scene_and_package =#{sceneAndPackage} and a.scene_type =#{sceneType}
     </select>
 
     <select id="querySceneGeneralTemplateList" parameterType="api.common.pojo.po.scene.SystemScenePackageSublistPO"
             resultType="java.lang.String">
-        select a.scene_name
+        select  DISTINCT(a.scene_name) scene_name
         FROM system_scene_package_sublist a join  scene_general_template s on a.scene_name=s.scene_id where
             a.is_deleted='0' and s.is_deleted='0' and a.scene_and_package =#{sceneAndPackage} and a.scene_type =#{sceneType}
     </select>