Merge branch 'feature/NoScanning' into qms/develop
This commit is contained in:
commit
3de7155c40
|
|
@ -186,7 +186,7 @@ public class UserControllerService {
|
||||||
if (Objects.nonNull(request.getDeptId())) {
|
if (Objects.nonNull(request.getDeptId())) {
|
||||||
request.setDeptIds(deptService.getWithChildren(request.getDeptId()));
|
request.setDeptIds(deptService.getWithChildren(request.getDeptId()));
|
||||||
}
|
}
|
||||||
if (!request.getShowAll() || !UserUtil.getRoles().contains(Constant.SUPER_ADMIN)) {
|
if (!request.getShowAll() && !UserUtil.getRoles().contains(Constant.SUPER_ADMIN)) {
|
||||||
request.setCreateById(UserUtil.getUserId());
|
request.setCreateById(UserUtil.getUserId());
|
||||||
}
|
}
|
||||||
IPage<UserVO> pu = uService.search(request);
|
IPage<UserVO> pu = uService.search(request);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue