|
|
|
@ -85,7 +85,8 @@ public class PoliceUserServiceImpl implements IPoliceUserService { |
|
|
|
.like(StrUtil.isNotBlank(searchValidate.getIdCode()), "u.id_code", searchValidate.getIdCode()) |
|
|
|
.like(StrUtil.isNotBlank(searchValidate.getIdCode()), "u.id_code", searchValidate.getIdCode()) |
|
|
|
.eq(StrUtil.isNotBlank(searchValidate.getPost()), "u.post_ids", searchValidate.getPost()) |
|
|
|
.eq(StrUtil.isNotBlank(searchValidate.getPost()), "u.post_ids", searchValidate.getPost()) |
|
|
|
.eq(Objects.nonNull(searchValidate.getRole()), "u.role_ids", searchValidate.getRole()) |
|
|
|
.eq(Objects.nonNull(searchValidate.getRole()), "u.role_ids", searchValidate.getRole()) |
|
|
|
.eq(StrUtil.isNotBlank(searchValidate.getDeptId()), "u.dept_ids", searchValidate.getDeptId()); |
|
|
|
.eq(StrUtil.isNotBlank(searchValidate.getDeptId()), "u.dept_ids", searchValidate.getDeptId()) |
|
|
|
|
|
|
|
.eq("u.is_delete",0); |
|
|
|
Integer roleId = AdminThreadLocal.getRoleId(); |
|
|
|
Integer roleId = AdminThreadLocal.getRoleId(); |
|
|
|
Integer deptId = AdminThreadLocal.getDeptId(); |
|
|
|
Integer deptId = AdminThreadLocal.getDeptId(); |
|
|
|
if (RoleEnum.SECOND_DEPT_CLASSES.getRoleId().equals(roleId)) { |
|
|
|
if (RoleEnum.SECOND_DEPT_CLASSES.getRoleId().equals(roleId)) { |
|
|
|
|