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

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

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

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

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

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

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