From 0babd2b56f995b5a30efca06ad0b6f3d7a91c34e Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Tue, 14 Dec 2021 16:07:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9=E4=BA=86?=
 =?UTF-8?q?=E4=B8=80=E4=B8=8B=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml   | 2 +-
 .../sarStandProjectLibrary/SarStandProjectLibraryMapper.xml  | 4 ++--
 .../SarInterpretationNationalStandardMapper.xml              | 2 +-
 .../SarStandardComplianceProductAssessMapper.xml             | 2 +-
 .../src/main/resources/mybatis/mapper/sys/UserEOMapper.xml   | 5 +++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml
index 864e0387..c2488f4b 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml
@@ -16,7 +16,7 @@
          left join ts_user on sar_public_idea_all.user_id=ts_user.USID
          WHERE
          sar_public_idea_all.idea_id = #{ideaId}
-         LIMIT ${(page-1)*size},${page*size}
+         LIMIT ${(page-1)*size},${size}
     </select>
 
     <select id="getAllDataByIdeaCount" resultType="java.lang.Integer">
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
index 49f537ee..604fb89c 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
@@ -168,7 +168,7 @@
             </if>
         </if>
 
-        limit ${(page-1)*size},${page*size}
+        limit ${(page-1)*size},${size}
     </select>
 
     <select id="selectPagessolostar" resultType="java.lang.String">
@@ -256,7 +256,7 @@
             </if>
         </if>
         )
-        limit ${(page-1)*size},${page*size}
+        limit ${(page-1)*size},${size}
 
     </select>
 
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
index 69179058..2f9f57ad 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
@@ -59,7 +59,7 @@
                     AND specific_item like concat(concat('%',#{specificItem}),'%')
                 </if>
                 ORDER BY STAND_ID, specific_item
-                LIMIT ${(current-1)*size},${current*size}
+                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
     </select>
     <select id="getAllDatasCout" resultType="java.lang.Integer">
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
index 62cf51da..2bad2b79 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
@@ -33,7 +33,7 @@
         </if>
         ORDER BY
         PRODUCT_NAME ASC
-        limit ${(page-1)*pageSize},${page*pageSize}
+        limit ${(page-1)*pageSize},${pageSize}
     </select>
 
     <select id="selectPagesCount"
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
index 240dcca8..bf4cd96e 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
@@ -799,10 +799,11 @@
         from ts_user
         where 1=1
         <if test="name != null and name != '' ">
-            ts_user.UNAME like  concat(concat('%',#{name}),'%') or
+           and ts_user.UNAME like  concat(concat('%',#{name}),'%') or
             ts_user.USID like  concat(concat('%',#{name}),'%')
         </if>
-        limit ${(page-1)*20},${page*20}
+        ORDER BY ts_user.USID
+        limit ${(page-1)*20},${20}
     </select>
 
 </mapper>