From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/system_service/src/main/resources/mappers/SystemPermissionMapper.xml | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/server/system_service/src/main/resources/mappers/SystemPermissionMapper.xml b/server/system_service/src/main/resources/mappers/SystemPermissionMapper.xml
index 9568ef5..91c5feb 100644
--- a/server/system_service/src/main/resources/mappers/SystemPermissionMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemPermissionMapper.xml
@@ -16,7 +16,7 @@
</resultMap>
<select id="selectManageList" resultMap="SystemPermissionListVO">
SELECT
- perm.`ID`, perm.`CODE`, perm.`NAME`, perm.`REMARK`, perm.`FIXED`, perm.`CREATE_TIME`, perm.`UPDATE_TIME`, perm.`CREATE_USER`, perm.`UPDATE_USER`, perm.`DELETED`,
+ perm.`ID`, perm.`CODE`, perm.`NAME`, perm.`MODULE`, perm.`REMARK`, perm.`FIXED`, perm.`CREATE_TIME`, perm.`UPDATE_TIME`, perm.`CREATE_USER`, perm.`UPDATE_USER`, perm.`DELETED`,
create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME
FROM SYSTEM_PERMISSION perm
@@ -24,14 +24,8 @@
LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = perm.UPDATE_USER
<where>
perm.DELETED = 0
- <if test="dto.code != null">
- AND perm.CODE LIKE CONCAT('%', #{dto.code}, '%')
- </if>
- <if test="dto.name != null">
- AND perm.`NAME` LIKE CONCAT('%', #{dto.name}, '%')
- </if>
</where>
- ${orderByClause}
+ ORDER BY perm.CREATE_TIME ASC, perm.ID ASC
</select>
<!-- 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺 -->
--
Gitblit v1.9.3