rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/NoScanning' into qms/develop

This commit is contained in:
曹鹏飞 2026-06-14 10:42:56 +08:00
parent f68d223a33 36ad7c0bfa
commit c7089dc05c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/UserControllerService.java
View File

@ -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 (!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);

5
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/UserSearchQO.java
View File

@ -31,4 +31,9 @@ public class UserSearchQO extends SearchBaseQO {
@JsonIgnore @JsonIgnore
private Long createById; private Long createById;
/**
* 是否显示所有用户
*/
private Boolean showAll = true;
} }