过滤数据！！！

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

@@ -643,7 +643,7 @@
 
 
     <select id="selectAllItemsByIds" resultType="com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto">
-        select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer
+        select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer,XCXSSRQ as xcxssrq,ZCCSSRQ as zccssrq
         from SAR_STAND_ITEMS
         where FILE_TYPE=#{type}
         <if test="ids != null">

adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml

@@ -89,12 +89,16 @@
         a.STAND_YEAR as standYear,ISSUE_TIME as issueTime,a.STAND_TYPE as standType,a.TEXT_STATUS as textStatus
         FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on
         a.ID = b.STAND_ID
+        left join sar_stand_items ssi on ssi.stand_id = a.id
         <where>
             <if test="standName != null">
                 (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')
                 or a.STAND_NAME LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%'))
                 and
             </if>
+        <if test="fileType !=null">
+            ssi.FILE_TYPE = #{fileType} and
+        </if>
         <if test="standType !=null">
             a.STAND_TYPE = #{standType} and
         </if>
@@ -103,6 +107,8 @@
                 #{item}
             </foreach>
         </where>
+        group by a.ID
+        limit #{start},#{end}
     </select>
     <select id="selectTimes" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandRegionalTimeDto">
         SELECT