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

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);
+        Integer maindeparment = userToken.getMaindeparment();
         if (type == 1) {
-            Integer maindeparment = userToken.getMaindeparment();
             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());
-            map.put("applicantId", userByPort.getId());
-        }
         if (map.containsKey("startDate")) {
             String startDate = (String) map.get("startDate");
             map.put("startDate", DateUtil.DateTimeToTimeStamp(startDate));
@@ -4378,7 +4376,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         }
         if (map.containsKey("depositoryId")) {
             depositoryIdList.add(ObjectFormatUtil.toInteger(map.get("depositoryId")));
-        }   else if (!map.containsKey("depositoryIdList")) {
+        }  else if (!map.containsKey("depositoryIdList")) {
             List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userByPort.getId());
             depositoryAndRole.addAll(roleService.findDepositoryAndRole(userByPort.getPosition()));
             for (RoleAndDepository depository : depositoryAndRole

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

@@ -516,7 +516,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
         if (depositoryIdList.size() > 0) {
             // 如果有剩余，开启线程进行处理
-            Future<Object> future = completionService.submit(new Task(depositoryIdList,type, adminorg, userByPort));
+            Future<Object> future = completionService.submit(new Task(depositoryIdList, type, adminorg, userByPort));
             futureList.add(future);
             openThreadSize++;
         }
@@ -966,7 +966,7 @@ public class DepositoryServiceImpl implements DepositoryService {
         // 当前选择仓库的类型
         String type;
 
-        public Task(List<Integer> depositoryIdList, String type,String adminorg, UserByPort userByPort) {
+        public Task(List<Integer> depositoryIdList, String type, String adminorg, UserByPort userByPort) {
             this.depositoryIdList = depositoryIdList;
             this.adminorg = adminorg;
             this.userByPort = userByPort;
@@ -980,11 +980,11 @@ public class DepositoryServiceImpl implements DepositoryService {
              */
             List<Depository> depositories = depositoryMapper.selectDepositoryByIds(depositoryIdList);
 
-            List<Integer> integerList  = new ArrayList<>();
+            List<Integer> integerList = new ArrayList<>();
-            if("1".equals(type)){
+            if ("1".equals(type)) {
                 // 如果是因为入库、库存转移而打开的仓库列表
                 integerList = roleService.findDepositoryIdForUser(userByPort);
-            }else{
+            } else {
                 // 如果是其他
                 integerList = roleService.findDepositoryIdForUserHas(userByPort);
 
@@ -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++;