From c7ff499956cda02698b813d2771374bd0d49b9fd Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Fri, 12 Aug 2022 17:35:04 +0800
Subject: [PATCH] ..
---
.../main/resources/mapper/resource/ResourceDao.xml | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index 98257b25..9214e59f 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -193,7 +193,10 @@
ORDER BY sd.type, sd.sort
- ORDER BY ${orderField} ${orderType}
+
+ ORDER BY ${orderField} ${orderType}
+
+
@@ -458,7 +461,9 @@
ORDER BY sd.type, sd.sort
- ORDER BY ${orderField} ${orderType}
+
+ ORDER BY ${orderField} ${orderType}
+
LIMIT ${pageNum}, ${pageSize}
@@ -600,10 +605,12 @@
GROUP BY dept_id ) tdr ON sd.id = tdr.dept_id
LEFT JOIN sys_region sr ON sd.district = sr.id
+ ORDER BY sd.type, sr.sort
) temp1
WHERE
1 = 1
AND temp1.deptCount != 0
+