Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理问题

Browse Source
This commit is contained in:
TS-QD1 2023-05-17 09:04:37 +08:00
parent 89b0f56ce7
commit d6c1d03168
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
service-core/src/main/resources/mybatis/mapper/core-manage-mapper.xml
View File

@ -54,7 +54,7 @@
AND
t1.user_type != #{excludeUserType}
</if>
<if test="noDepartment != null and (noDepartment == true or noDepartment == 'true')">
<if test="noDepartment != null and noDepartment == 1">
AND
t1.user_id NOT IN (SELECT st1.user_id FROM sys_department_user st1)
</if>
@ -110,7 +110,7 @@
)
</if>
<!-- 角色 -->
<if test="noRole != null and (noRole == true or noRole == 'true')">
<if test="noRole != null and noRole == 1">
AND
t1.user_id NOT IN (SELECT st2.user_id FROM sys_role_user st2)
</if>
@ -140,7 +140,7 @@
)
</if>
<!-- 用户职位 -->
<if test="noPosition != null and (noPosition == true or noPosition == 'true')">
<if test="noPosition != null and noPosition == 1">
AND
t1.user_id NOT IN (SELECT st3.user_id FROM sys_position_user st3)
</if>
@ -170,7 +170,7 @@
)
</if>
<!-- 用户组 -->
<if test="noGroup != null and (noGroup == true or noGroup == 'true')">
<if test="noGroup != null and noGroup == 1">
AND
t1.user_id NOT IN (SELECT st4.user_id FROM sys_group_user st4)
</if>

8
service-core/src/main/resources/templates/core/manage/list-department-user.html
View File

@ -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: {

4
service-role/src/main/java/ink/wgink/service/role/service/impl/RoleUserServiceImpl.java
View File

@ -301,7 +301,9 @@ public class RoleUserServiceImpl extends DefaultBaseService implements IRoleUser
@Override
public SuccessResultList<List<UserDTO>> listPageUserByRoleId(String roleId, ListPage page) {
PageHelper.startPage(page.getPage(), page.getRows());
List<UserDTO> userDTOs = listUserByRoleId(roleId);
Map<String, Object> params = page.getParams();
params.put("roleId", roleId);
List<UserDTO> userDTOs = roleUserDao.listUser(params);
PageInfo<UserDTO> pageInfo = new PageInfo<>(userDTOs);
return new SuccessResultList<>(userDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
}

8
service-role/src/main/resources/mybatis/mapper/role-user-mapper.xml
View File

@ -143,13 +143,13 @@
</if>
<if test="keywords != null and keywords != ''">
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}, '%')
)
</if>
<if test="roleId != null and roleId != ''">