fix: 体系数据列表数据条数错误

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml

@@ -145,15 +145,35 @@
     </select>
 
     <select id="getGBStandMenu" resultType="com.adc.da.slrs.sarStandMenu.entity.SarStandMenu">
-        select sm.MENU_ID, sm.STAND_ID from SAR_STAND_MENU AS sm
-            LEFT JOIN sar_standards_info AS stand ON sm.STAND_ID = stand.ID
-        where stand.STAND_TYPE = 'INLAND' AND LENGTH(sm.MENU_ID) > 30
+        select
+            DISTINCT
+            sms.ID AS menuId,
+            stand.ID as standId
+        from SAR_STAND_MENU AS sm
+            LEFT JOIN sar_standards_info AS stand ON sm.STAND_ID = stand.ID AND stand.VALID_FLAG = '0'
+            LEFT JOIN sar_menu_standard sms on sm.MENU_ID = sms.ID
+        where stand.STAND_TYPE = 'INLAND'
+            AND sms.MENU_NAME IS NOT NULL
+            AND LENGTH(sm.MENU_ID) > 30
+            AND sm.VALID_FLAG = '0'
+            AND sms.id in (select id from sar_menu_standard where valid_flag = 0)
+        group by stand.ID
     </select>
 
     <select id="getFBStandMenu" resultType="com.adc.da.slrs.sarStandMenu.entity.SarStandMenu">
-        select sm.MENU_ID, sm.STAND_ID from SAR_STAND_MENU AS sm
-            LEFT JOIN sar_standards_info AS stand ON sm.STAND_ID = stand.ID
-        where stand.STAND_TYPE = 'FOREIGN' AND LENGTH(sm.MENU_ID) > 30
+        select
+            DISTINCT
+            sms.ID AS menuId,
+            stand.ID as standId
+        from SAR_STAND_MENU AS sm
+            LEFT JOIN sar_standards_info AS stand ON sm.STAND_ID = stand.ID AND stand.VALID_FLAG = '0'
+            LEFT JOIN sar_menu_standard sms on sm.MENU_ID = sms.ID
+        where stand.STAND_TYPE = 'FOREIGN'
+            AND sms.MENU_NAME IS NOT NULL
+            AND LENGTH(sm.MENU_ID) > 30
+            AND sm.VALID_FLAG = '0'
+            AND sms.id in (select id from sar_menu_standard where valid_flag = 0)
+        group by stand.ID
     </select>
 
     <select id="getStandInfoSystemData" resultType="com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO">
@@ -173,12 +193,14 @@
                 WHEN gb.STAND_TYPE = 'INLAND' THEN 1
                 WHEN gb.STAND_TYPE = 'FOREIGN' THEN 2
             END AS standTypeSort,
-            m.MENU_ID AS menuId
+            sms.ID AS menuId
         FROM
             `sar_standards_info` AS gb
                 LEFT JOIN `sar_stand_attr_info` AS gba ON gb.ID = gba.STAND_ID
                 LEFT JOIN `sar_stand_menu` AS m ON gb.ID = m.STAND_ID AND LENGTH(m.MENU_ID) > 30
-        WHERE 1 = 1
+                LEFT JOIN sar_menu_standard sms on m.MENU_ID = sms.ID
+        WHERE gb.VALID_FLAG = '0'
+        AND sms.id in (select id from sar_menu_standard where valid_flag = 0)
         <!--国标/外标-->
         <if test="param.standNo != null and param.standNo != ''">
             AND gb.STAND_TYPE = #{dataSource}
@@ -233,6 +255,7 @@
                 #{item}
             </foreach>
         </if>
+        group by gb.ID
     </select>
 
 </mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandMenu/SarBussStandMenuMapper.xml

@@ -203,6 +203,24 @@
         where buss_stand_id = #{bussStandId} and valid_flag=0
     </select>
 
+    <select id="getESStandMenu" resultType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu">
+        select
+            DISTINCT
+            sms.ID AS menuId,
+            stand.ID AS bussStandId
+        from sar_buss_stand_menu AS sm
+                LEFT JOIN sar_bussioness_stand AS stand
+                    ON sm.BUSS_STAND_ID = stand.ID AND
+                       stand.VALID_FLAG = 0
+                LEFT JOIN sar_menu_standard sms on sm.MENU_ID = sms.ID
+        where LENGTH(sm.MENU_ID) > 30
+               AND sms.MENU_NAME IS NOT NULL
+               AND sm.VALID_FLAG = 0
+               AND sm.TREE_TYPE is null
+               AND sms.id in (select id from sar_menu_standard where valid_flag = 0)
+        group by stand.ID
+    </select>
+
     <delete id="deleteByStandIdAndMenuId" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu">
     delete from SAR_BUSS_STAND_MENU
      where buss_stand_id = #{bussStandId, jdbcType=VARCHAR} and MENU_ID = #{menuId, jdbcType=VARCHAR}

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml

@@ -1269,6 +1269,7 @@
 
     <select id="getESSystemData" resultType="com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO">
         SELECT
+            DISTINCT
             es.ID AS standId,
             es.STAND_CODE AS standNo,
             es.STAND_NAME AS standName,
@@ -1279,7 +1280,7 @@
             esa.QCDW AS dept,
             esa.QCRBUSS AS draftUserName,
             'ENTERPRISE' AS dataSource,
-            m.MENU_ID AS menuId,
+            sms.ID AS menuId,
             3 AS standTypeSort,
             CASE
                 when es.stand_code like concat('%', 'Q/FT A', '%') THEN 0
@@ -1304,8 +1305,13 @@
         FROM
         `sar_bussioness_stand` AS es
         LEFT JOIN `sar_buss_stand_attr_info` AS esa ON es.ID = esa.STAND_ID
-        LEFT JOIN `sar_buss_stand_menu` AS m ON es.ID = m.BUSS_STAND_ID AND LENGTH(m.MENU_ID) > 30
+        LEFT JOIN `sar_buss_stand_menu` AS m ON es.ID = m.BUSS_STAND_ID
+                                                    AND LENGTH(m.MENU_ID) > 30
+                                                    AND m.TREE_TYPE is null
+                                                    AND m.VALID_FLAG = 0
+                    LEFT JOIN sar_menu_standard sms on m.MENU_ID = sms.ID
         WHERE 1 = 1
+        AND sms.id in (select id from sar_menu_standard where valid_flag = 0)
             <!--标准编号-->
             <if test="param.standNo != null and param.standNo != ''">
                 AND es.STAND_CODE LIKE CONCAT('%',#{param.standNo},'%')
@@ -1351,5 +1357,6 @@
                     #{item}
                 </foreach>
             </if>
+        group by es.ID
     </select>
 </mapper>