diff --git a/service-core/src/main/resources/mybatis/mapper/core-manage-mapper.xml b/service-core/src/main/resources/mybatis/mapper/core-manage-mapper.xml index 9677e4ea..b2decb18 100644 --- a/service-core/src/main/resources/mybatis/mapper/core-manage-mapper.xml +++ b/service-core/src/main/resources/mybatis/mapper/core-manage-mapper.xml @@ -54,7 +54,7 @@ AND t1.user_type != #{excludeUserType} - + AND t1.user_id NOT IN (SELECT st1.user_id FROM sys_department_user st1) @@ -110,7 +110,7 @@ ) - + AND t1.user_id NOT IN (SELECT st2.user_id FROM sys_role_user st2) @@ -140,7 +140,7 @@ ) - + AND t1.user_id NOT IN (SELECT st3.user_id FROM sys_position_user st3) @@ -170,7 +170,7 @@ ) - + AND t1.user_id NOT IN (SELECT st4.user_id FROM sys_group_user st4) diff --git a/service-core/src/main/resources/templates/core/manage/list-department-user.html b/service-core/src/main/resources/templates/core/manage/list-department-user.html index 20740211..b4c40073 100644 --- a/service-core/src/main/resources/templates/core/manage/list-department-user.html +++ b/service-core/src/main/resources/templates/core/manage/list-department-user.html @@ -330,12 +330,12 @@ endTime: $('#endTime').val(), userType: $('#userType').val(), userState: $('#userState').val(), - noDepartment: noDepartment, - noRole: noRole, + noDepartment: noDepartment ? 1 : 0, + noRole: noRole ? 1 : 0, roleId: noRole ? '' : $('#roleId').val(), - noPosition: noPosition, + noPosition: noPosition ? 1 : 0, positionId: noPosition ? '' : $('#positionId').val(), - noGroup: noGroup, + noGroup: noGroup ? 1 : 0, groupId: noGroup ? '' : $('#groupId').val() }, page: { diff --git a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleUserServiceImpl.java b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleUserServiceImpl.java index bfa6fab2..8258c731 100644 --- a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleUserServiceImpl.java +++ b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleUserServiceImpl.java @@ -301,7 +301,9 @@ public class RoleUserServiceImpl extends DefaultBaseService implements IRoleUser @Override public SuccessResultList> listPageUserByRoleId(String roleId, ListPage page) { PageHelper.startPage(page.getPage(), page.getRows()); - List userDTOs = listUserByRoleId(roleId); + Map params = page.getParams(); + params.put("roleId", roleId); + List userDTOs = roleUserDao.listUser(params); PageInfo pageInfo = new PageInfo<>(userDTOs); return new SuccessResultList<>(userDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); } diff --git a/service-role/src/main/resources/mybatis/mapper/role-user-mapper.xml b/service-role/src/main/resources/mybatis/mapper/role-user-mapper.xml index 4d784a28..ee8d0c54 100644 --- a/service-role/src/main/resources/mybatis/mapper/role-user-mapper.xml +++ b/service-role/src/main/resources/mybatis/mapper/role-user-mapper.xml @@ -143,13 +143,13 @@ AND ( - user_username LIKE CONCAT('%', #{keywords}, '%') + t1.user_username LIKE CONCAT('%', #{keywords}, '%') OR - user_name LIKE CONCAT('%', #{keywords}, '%') + t1.user_name LIKE CONCAT('%', #{keywords}, '%') OR - user_phone LIKE CONCAT('%', #{keywords}, '%') + t1.user_phone LIKE CONCAT('%', #{keywords}, '%') OR - user_email LIKE CONCAT('%', #{keywords}, '%') + t1.user_email LIKE CONCAT('%', #{keywords}, '%') )