From 64f45c75ea93911b9841bf00bb4c436cd294be3a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 15 九月 2023 18:30:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/resources/mappers/SystemRoleMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/resources/mappers/SystemRoleMapper.xml b/server/service/src/main/resources/mappers/SystemRoleMapper.xml
index e2851b9..7c35d77 100644
--- a/server/service/src/main/resources/mappers/SystemRoleMapper.xml
+++ b/server/service/src/main/resources/mappers/SystemRoleMapper.xml
@@ -16,7 +16,7 @@
</resultMap>
<select id="selectManageList" parameterType="com.doumee.dao.system.dto.QuerySystemUserDTO" resultMap="SystemRoleListVO">
SELECT
- role.ID, role.`CODE`, role.`NAME`, role.`REMARK`, role.`FIXED`, role.`CREATE_TIME`, role.`UPDATE_TIME`,
+ role.ID, role.`CODE`, role.`NAME`, role.`REMARK`, role.`FIXED`, role.`CREATE_TIME`, role.`UPDATE_TIME`,role.type,
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_ROLE role
@@ -30,6 +30,9 @@
<if test="dto.name != null and dto.name != ''">
AND role.`NAME` LIKE CONCAT('%', #{dto.name}, '%')
</if>
+ <if test="dto.type != null and dto.type != ''">
+ AND role.type = #{dto.type}
+ </if>
</where>
${orderByClause}
</select>
--
Gitblit v1.9.3