diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml index 3e2e36fc..83e14df7 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml @@ -23,11 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" parameterType="cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RolePageReqVO"> select distinct su.*,GROUP_CONCAT(DISTINCT sr2.name SEPARATOR ',') AS roleNames from inspection_staff staff - LEFT JOIN system_users su on staff.user_id = su.id - left join system_user_role sr on su.id = sr.user_id - left join system_role sr2 on sr.role_id = sr2.id + inner JOIN system_users su on staff.user_id = su.id + inner join system_user_role sr on su.id = sr.user_id + inner join system_role sr2 on sr.role_id = sr2.id - su.deleted = 0 + su.deleted = 0 and staff.deleted =0 and (su.nickname like CONCAT('%',#{role.nickname},'%') OR su.username like CONCAT('%',#{role.nickname},'%'))