修改出库、入库查询时的仓库选择功能

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

@@ -480,9 +480,14 @@ public class PageController {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
-        if (type == 1) {
         Integer maindeparment = userToken.getMaindeparment();
+        if (type == 1) {
             mv.addObject("adminorg", maindeparment);
+        } else if (type == 2) {
+            if (!PublicConfig.roleAdminorgList.contains(maindeparment)) {
+                type = 21;  // 查看库存且不能看所有仓库
+                mv.addObject("adminorg", maindeparment);
+            }
         }
         mv.addObject("type", type);
         mv.setViewName("pages/material/selectDepository");

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@@ -4365,9 +4365,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             map.put("applicantTime", DateUtil.DateTimeByDayToTimeStamp(applyTime));
         }
         List<Integer> depositoryIdList = new ArrayList<>();
-        if (map.size() <= 2) {
         map.put("applicantId", userByPort.getId());
-        }
         if (map.containsKey("startDate")) {
             String startDate = (String) map.get("startDate");
             map.put("startDate", DateUtil.DateTimeToTimeStamp(startDate));

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java

@@ -1026,9 +1026,9 @@ public class DepositoryServiceImpl implements DepositoryService {
             CompletionService<Object> completionService = new ExecutorCompletionService<Object>(exs);
 
             // 定义开启线程数
-            Integer openThreadSize = 0;
+            int openThreadSize = 0;
             for (Depository depository : depositories) {
-                if ("".equals(adminorg) || "361".equals(adminorg)) { // 如果不按部门分类或是仓储中心人员，则全部加载
+                if (("".equals(adminorg) || PublicConfig.roleAdminorgList.contains(Integer.parseInt(adminorg))) && !"21".equals(type)) { // 如果不按部门分类或是仓储中心人员且不是入库、库存转移，则全部加载
                     Future<Object> submit = completionService.submit(new PlaceTask(depository));
                     futureList.add(submit);
                     openThreadSize++;