diff --git a/src/main/resources/mapper/system/UserMapper.xml b/src/main/resources/mapper/system/UserMapper.xml index 0940c488..2ce46ee6 100644 --- a/src/main/resources/mapper/system/UserMapper.xml +++ b/src/main/resources/mapper/system/UserMapper.xml @@ -24,7 +24,9 @@ LEFT JOIN sys_user_role sur ON u.id = sur.user_id LEFT JOIN sys_role r ON sur.role_id = r.id - u.is_deleted = 0 AND u.username != 'root' + u.is_deleted = 0 + + AND r.name != '${@com.youlai.boot.common.constant.SystemConstants@ROOT_ROLE_CODE}' AND ( u.username LIKE CONCAT('%',#{queryParams.keywords},'%') @@ -118,9 +120,9 @@ - + - + @@ -191,7 +193,7 @@ sys_user u LEFT JOIN sys_dept d ON u.dept_id = d.id - u.is_deleted = 0 AND u.username != 'root' + u.is_deleted = 0 AND (u.username LIKE CONCAT('%',#{keywords},'%') OR u.nickname LIKE CONCAT('%',#{keywords},'%')