From a03db1068aac7c684a2074fd7d7b56a5fd3de414 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 16 Jun 2021 11:02:02 +0800
Subject: [PATCH] feat:1

---
 .../com/adc/da/sys/controller/DicEORestController.java   | 7 +++++++
 .../resources/mybatis/mapper/sys/DictionaryEOMapper.xml  | 9 +++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicEORestController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicEORestController.java
index 73946868..10418330 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicEORestController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicEORestController.java
@@ -37,6 +37,13 @@ public class DicEORestController extends BaseController<DictionaryEO> {
 	public ResponseMessage<PageInfo<DictionaryEO>> page(DictionaryEOPage page) throws Exception {
 		page.setDictionaryCodeOperator("like");
 		page.setDictionaryNameOperator("like");
+		if(org.apache.commons.lang3.StringUtils.isNotBlank(page.getPaixu()) && org.apache.commons.lang3.StringUtils.isNotBlank(page.getShunxu())){
+			String sql = page.getPaixu()+" "+page.getShunxu();
+			page.setSql(sql);
+		}else{
+			String sql = "order_num,u0.id";
+			page.setSql(sql);
+		}
 		List<DictionaryEO> rows = dicEOService.queryAllDicByPage(page);
 		return Result.success(getPageInfo(page.getPager(), rows));
 	}
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml
index 898dc60e..a293f7cc 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml
@@ -267,12 +267,13 @@
 	<!-- 查询TS_DICTIONARY列表 -->
 	<select id="queryAllDicByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
 		select <include refid="Base_Column_List" /> from
-		(select tmp_tb.* , rownum rn from
+		(select tmp_tb.* from
 		(select <include refid="Base_Column_List" /> from TS_DICTIONARY u0
 		<include refid="Base_Where_Clause"/>
-		order by order_num,u0.id
-		) tmp_tb where rownum &lt;= ${pager.endIndex})
-		where rn &gt;= ${pager.startIndex}
+		<if test="sql != null">
+			ORDER BY ${sql}
+		</if>
+		) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
 	</select>
 
 	<select id="getDictionarySelList" parameterType="java.lang.String" resultType="com.adc.da.sys.common.SelectionResult">