修改审批后的管理员获取

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

@@ -227,7 +227,7 @@ public class CompanyController {
                     if (depositoryName == null) {
                         depositoryName = "";
                     }
-                    Depository.append(depositoryName + " ");
+                    Depository.append(depositoryName).append(" ");
                 }
                 postP.setDepositoryName(Depository.toString());
             } else {

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

@@ -1053,9 +1053,9 @@ public class DepositoryController {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
-        // 获取当前用户管理的仓库
         // 查询当前用户管理的仓库
         List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId());
+        depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition()));
         // 查询当前用户部门拥有的仓库
         List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString());
         List<Integer> depositoryIdList = new ArrayList<>();

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

@@ -99,6 +99,7 @@ public class GroupController {
         List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString());
         // 查询当前用户管理的仓库
         List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId());
+        depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition()));
 
         List<Integer> depositoryIdList = new ArrayList<>();
         for (Depository depository : depositoryByAdminorg
@@ -377,6 +378,7 @@ public class GroupController {
 
         // 查询当前用户管理的仓库
         List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId());
+        depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition()));
 
         List<Integer> depositoryIdList = new ArrayList<>();
         for (Depository depository : depositoryByAdminorg
@@ -778,6 +780,7 @@ public class GroupController {
             List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString());
             // 查询当前用户管理的仓库
             List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId());
+            depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition()));
 
             List<Integer> depositoryIdList = new ArrayList<>();
             for (Depository depository : depositoryByAdminorg
@@ -846,6 +849,7 @@ public class GroupController {
         List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString());
         // 查询当前用户管理的仓库
         List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId());
+        depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition()));
 
         List<Integer> depositoryIdList = new ArrayList<>();
         for (Depository depository : depositoryByAdminorg

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

@@ -1283,6 +1283,7 @@ public class PageController {
 
         // 获取当前用户管理的仓库
         List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId());
+        depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition()));
 
         List<Integer> depositoryIdList = new ArrayList<>();
         for (Depository depository : depositoryByAdminorg
@@ -1354,6 +1355,7 @@ public class PageController {
 
         // 获取当前用户管理的仓库
         List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId());
+        depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition()));
 
         List<Integer> depositoryIdList = new ArrayList<>();
         for (Depository depository : depositoryByAdminorg
@@ -2760,6 +2762,7 @@ public class PageController {
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
         List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId());
+        depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition()));
         StringBuilder RoleName = new StringBuilder();
         StringBuilder DepositoryName = new StringBuilder();
         for (RoleAndDepository roleAndDepository : depositoryAndRole) {

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

@@ -374,6 +374,7 @@ public class PlaceController {
         List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString());
         // 查询当前用户管理的仓库
         List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId());
+        depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition()));
         Integer mid = ObjectFormatUtil.toInteger(map.get("mid"));
         Inventory inventoryById = materialService.findInventoryById(mid);
         List<PlaceP> placeList = new ArrayList<>();

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

@@ -4332,7 +4332,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             depositoryIdList.add(ObjectFormatUtil.toInteger(map.get("depositoryId")));
         } else {
             List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userByPort.getId());
-
+            depositoryAndRole.addAll(roleService.findDepositoryAndRole(userByPort.getPosition()));
             for (RoleAndDepository depository : depositoryAndRole
             ) {
                 depositoryIdList.add(depository.getDepositoryId());
@@ -4378,6 +4378,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             depositoryIdList.add(ObjectFormatUtil.toInteger(map.get("depositoryId")));
         } else {
             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

@@ -341,6 +341,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
         // 获取当前用户管理的仓库
         List<RoleAndDepository> depositoryAndRole = roleMapper.findDepositoryAndRole(user.getId());
+        depositoryAndRole.addAll(roleMapper.findDepositoryAndRole(user.getPosition()));
 
         List<RoleAndDepository> roleAndDepositoryList = new ArrayList<>();
         depositoryParentIdList = new ArrayList<>();
@@ -975,7 +976,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
             // 获取当前用户管理的仓库
             List<RoleAndDepository> depositoryAndRole = roleMapper.findDepositoryAndRole(userByPort.getId());
-
+            depositoryAndRole.addAll(roleMapper.findDepositoryAndRole(userByPort.getPosition()));
             Map<String, Object> paramForFindDepositoryId = new HashMap<>();
             paramForFindDepositoryId.put("type", 1);
             paramForFindDepositoryId.put("uid", userByPort.getId());

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

@@ -608,6 +608,7 @@ public class GroupServiceImpl implements GroupService {
 
         // 查询当前用户管理的仓库
         List<RoleAndDepository> depositoryAndRole = roleMapper.findDepositoryAndRole(userToken.getId());
+        depositoryAndRole.addAll(roleMapper.findDepositoryAndRole(userToken.getPosition()));
 
         List<Integer> depositoryIdList = new ArrayList<>();
         for (Depository depository : depositoryByAdminorg

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

@@ -648,6 +648,7 @@ public class RoleServiceImpl implements RoleService {
         }
         // 查询当前用户管理的仓库
         List<RoleAndDepository> depositoryAndRole = roleMapper.findDepositoryAndRole(userToken.getId());
+        depositoryAndRole.addAll(roleMapper.findDepositoryAndRole(userToken.getPosition()));
 
         for (RoleAndDepository depository : depositoryAndRole) {
             if (!depositoryIdList.contains(depository.getDepositoryId())) {