组合入库审批完成

src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java

@@ -236,8 +236,7 @@ public class DepositoryRecordController {
                     }
                 }
             }
-        }
+        } else {
-        else {
             List<Object> errMsg = new ArrayList<>();
             List<Object> successMsg = new ArrayList<>();
             for (Integer param : params) {
@@ -562,7 +561,16 @@ public class DepositoryRecordController {
     @GetMapping("/applicationInView")
     public RestResponse findApplicationInRecordByCondition(@RequestParam Map<String, Object> map, HttpServletRequest request) {
         UserByPort userToken = (UserByPort) request.getAttribute("userToken");
-        List<ApplicationInRecordP> list = depositoryRecordService.findApplicationInRecordPByUser(userToken, map);
+        List<ApplicationInRecordP> list = new ArrayList<>();
+        Integer recordPCount = 0;
+        if (Integer.compare(userToken.getMaindeparment(), 361) == 0) {
+            list = depositoryRecordService.findApplicationInRecordPByCondition(map, userToken);
+            recordPCount = depositoryRecordService.findApplicationInRecordPCountByCondition(map);
+        } else {
+
+            list = depositoryRecordService.findApplicationInRecordPByUser(userToken, map);
+            recordPCount = depositoryRecordService.findApplicationInRecordPCountByUser(userToken, map);
+        }
         for (ApplicationInRecordP applicationInRecordP : list) {
             if (applicationInRecordP.getPrice() != null) {
                 applicationInRecordP.setPrice(applicationInRecordP.getPrice() / 100);
@@ -570,7 +578,7 @@ public class DepositoryRecordController {
                 applicationInRecordP.setPrice(0.0);
             }
         }
-        return new RestResponse(list, depositoryRecordService.findApplicationInRecordPCountByUser(userToken, map), 200);
+        return new RestResponse(list, recordPCount, 200);
     }
 
     // 当前仓库中该用户的子订单详情