From 534caf3bdb2d5031a7c1a0e08f1550af86709d1b Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 29 Jul 2021 15:21:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E7=AD=96=E7=8A=B6=E6=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=EF=BC=81=EF=BC=81=EF=BC=81=20=E6=9F=A5=E8=AF=A2bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/sys/DicTypeEOMapper.xml    | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml
index cd17691a..288146c0 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml
@@ -26,7 +26,14 @@
     <!--分页显示A-->
     <sql id="Base_Column_ListPageA">
 		TS_DICTYPE.id,TS_DICTYPE.parent_id, TS_DICTYPE.dic_type_code, TS_DICTYPE.dic_type_name, TS_DICTYPE.dic_id,
-		TS_DICTYPE.valid_flag,TS_DICTYPE.creation_time,TS_DICTYPE.modify_time,TS_DICTYPE.describes,TS_DICTYPE.show_index,tree_pid
+		TS_DICTYPE.valid_flag,TS_DICTYPE.creation_time,TS_DICTYPE.modify_time,TS_DICTYPE.describes,TS_DICTYPE.show_index,
+		tree_pid
+	</sql>
+
+    <!--分页显示A-->
+    <sql id="Base_Column_ListPageNewA">
+		TS_DICTYPE.id,TS_DICTYPE.parent_id, TS_DICTYPE.dic_type_code, TS_DICTYPE.dic_type_name, TS_DICTYPE.dic_id,
+		TS_DICTYPE.valid_flag,TS_DICTYPE.creation_time,TS_DICTYPE.modify_time,TS_DICTYPE.describes,(@rownum :=@rownum + 1) AS rownum,TS_DICTYPE.show_index,tree_pid
 	</sql>
 
     <!--分页显示B-->
@@ -34,6 +41,11 @@
 		a.id,a.parent_id, a.dic_type_code, a.dic_type_name, a.dic_id,a.valid_flag,a.creation_time,a.modify_time,a.describes,a.show_index
 	</sql>
 
+    <!--分页显示B-->
+    <sql id="Base_Column_ListPageNewB">
+		a.id,a.parent_id, a.dic_type_code, a.dic_type_name, a.dic_id,a.valid_flag,a.creation_time,a.modify_time,a.rownum,a.describes,a.show_index
+	</sql>
+
     <sql id="Dic_Type_List">
 		u.*, ur.id as type_id,
 		ur.dic_type_code as dic_type_code,
@@ -294,19 +306,20 @@
     <!-- 查询TS_DICTYPE列表 -->
     <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
         select
-        <include refid="Base_Column_ListPageB"/>
+        <include refid="Base_Column_ListPageNewB"/>
         from
-        (select tmp_tb.* , rownum rn from
+        (select tmp_tb.* from
         (select
-        <include refid="Base_Column_ListPageA"/>
+        <include refid="Base_Column_ListPageNewA"/>
         from TS_DICTYPE
         LEFT JOIN TS_DICTIONARY td ON td.id = TS_DICTYPE.dic_id
+        ,(SELECT @rownum := 0) b
         <include refid="Base_Where_ClausePage"/>
         <if test="pager.orderCondition != null and pager.orderCondition != ''">
             ${pager.orderCondition}
         </if>
-        ) tmp_tb where rownum &lt;= ${pager.endIndex}) a
-        where rn &gt;= ${pager.startIndex}
+        ) tmp_tb where tmp_tb.rownum &lt;= ${pager.endIndex}) a
+        where a.rownum &gt;= ${pager.startIndex}
         ORDER BY a.show_index
     </select>
     <!-- TS_DICTYPE 列表总数 -->