Merge remote-tracking branch 'origin/develop_master' into develop_master

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml

@@ -41,9 +41,9 @@
         left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
         WHERE
         sar_public_idea_all.idea_id = #{ideaId}
-        LIMIT ${(page-1)*size},${size}
         )c
         ORDER BY CONVERT(SUBSTRING(c.part_code,1,(SELECT LOCATE('.',CONCAT(c.part_code,'.')))),SIGNED) ,c.rows
+        LIMIT ${(page-1)*size},${size}
     </select>
 
     <select id="getAllDataByIdeaCount" resultType="java.lang.Integer">

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml

@@ -58,9 +58,9 @@
                 or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%'))
             </if>
         order by sar_stand_unqualified.ID,sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc
-        limit #{start},#{end}
         )c
         ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows
+        limit #{start},#{end}
     </select>
 
     <select id="getSarStandUnqualifiedExcel" resultType="com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified">

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml

@@ -59,8 +59,9 @@
                     AND specific_item like concat(concat('%',#{specificItem}),'%')
                 </if>
                 ORDER BY STAND_ID, specific_item
-                LIMIT ${(current-1)*size},${size}
+
                 ) c  ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.specific_item,1,(SELECT LOCATE('.',CONCAT(c.specific_item,'.')))),SIGNED) ,rows
+                LIMIT ${(current-1)*size},${size}
     </select>
     <select id="getAllDatasCout" resultType="java.lang.Integer">
             SELECT