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

Merge remote-tracking branch 'origin/qms/develop' into qms/develop

This commit is contained in:
yf001217 2026-06-14 11:01:02 +08:00
parent 80779a5d15 3de7155c40
commit a0fce0b525
3 changed files with 6 additions and 7 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())) {
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());
}
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
private Long createById;
/**
* 是否显示所有用户
*/
private Boolean showAll = true;
}

6
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java
View File

@ -207,12 +207,6 @@ public class QmsCoaReviewServiceImpl extends ServiceImpl<QmsCoaReviewMapper, Qms
}
} else if (Objects.equals(status, 3)) {
// 状态3时只能改COA报告和图片
if (Objects.nonNull(qo.getMaterialNo()) && !qo.getMaterialNo().isEmpty()) {
throw new NflgException(STATE.BusinessError, "已驳回状态只能修改COA报告和图片");
}
if (Objects.nonNull(qo.getPurchaseNo()) && !qo.getPurchaseNo().isEmpty()) {
throw new NflgException(STATE.BusinessError, "已驳回状态只能修改COA报告和图片");
}
if (Objects.nonNull(qo.getCoaFile()) && !qo.getCoaFile().isEmpty()) {
updater.set(QmsCoaReview::getCoaFile, qo.getCoaFile());
}