From 7ad3d376d3ccb029bb8077725aa70747b0ebb2ad Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 14 三月 2024 16:15:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/resources/mappers/SystemPermissionMapper.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/resources/mappers/SystemPermissionMapper.xml b/server/service/src/main/resources/mappers/SystemPermissionMapper.xml
index 9568ef5..ba0de90 100644
--- a/server/service/src/main/resources/mappers/SystemPermissionMapper.xml
+++ b/server/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.`type`, perm.`CODE`, perm.`NAME`, 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,10 +24,13 @@
LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = perm.UPDATE_USER
<where>
perm.DELETED = 0
- <if test="dto.code != null">
+ <if test="dto.code != null and dto.code!=''">
AND perm.CODE LIKE CONCAT('%', #{dto.code}, '%')
</if>
- <if test="dto.name != null">
+ <if test="dto.type != null">
+ AND ifnull(perm.type,0) in(0, ${dto.type})
+ </if>
+ <if test="dto.name != null and dto.name!=''">
AND perm.`NAME` LIKE CONCAT('%', #{dto.name}, '%')
</if>
</where>
--
Gitblit v1.9.3