From 16a6cfb0cd8a1686a0ee7677346178bdeef44206 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Thu, 25 May 2023 10:20:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=89=B9=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E7=AE=A1=E7=90=86=E5=91=98=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../depository_manage/controller/CompanyController.java | 2 +- .../depository_manage/controller/DepositoryController.java | 2 +- .../depository_manage/controller/GroupController.java | 4 ++++ .../depository_manage/controller/PageController.java | 3 +++ .../depository_manage/controller/PlaceController.java | 1 + .../service/impl/DepositoryRecordServiceImpl.java | 3 ++- .../depository_manage/service/impl/DepositoryServiceImpl.java | 3 ++- .../depository_manage/service/impl/GroupServiceImpl.java | 1 + .../depository_manage/service/impl/RoleServiceImpl.java | 1 + 9 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/CompanyController.java b/src/main/java/com/dreamchaser/depository_manage/controller/CompanyController.java index d6b3561a..febfa1bb 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/CompanyController.java +++ b/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 { diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java index c951e5a5..19eb2a04 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java +++ b/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 depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); + depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition())); // 查询当前用户部门拥有的仓库 List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); List depositoryIdList = new ArrayList<>(); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java index 86f085fe..5be855eb 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java @@ -99,6 +99,7 @@ public class GroupController { List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); // 查询当前用户管理的仓库 List depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); + depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition())); List depositoryIdList = new ArrayList<>(); for (Depository depository : depositoryByAdminorg @@ -377,6 +378,7 @@ public class GroupController { // 查询当前用户管理的仓库 List depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); + depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition())); List depositoryIdList = new ArrayList<>(); for (Depository depository : depositoryByAdminorg @@ -778,6 +780,7 @@ public class GroupController { List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); // 查询当前用户管理的仓库 List depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); + depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition())); List depositoryIdList = new ArrayList<>(); for (Depository depository : depositoryByAdminorg @@ -846,6 +849,7 @@ public class GroupController { List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); // 查询当前用户管理的仓库 List depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); + depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition())); List depositoryIdList = new ArrayList<>(); for (Depository depository : depositoryByAdminorg diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 3704ad7e..726af025 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -1283,6 +1283,7 @@ public class PageController { // 获取当前用户管理的仓库 List depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); + depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition())); List depositoryIdList = new ArrayList<>(); for (Depository depository : depositoryByAdminorg @@ -1354,6 +1355,7 @@ public class PageController { // 获取当前用户管理的仓库 List depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); + depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition())); List depositoryIdList = new ArrayList<>(); for (Depository depository : depositoryByAdminorg @@ -2760,6 +2762,7 @@ public class PageController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); List depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); + depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition())); StringBuilder RoleName = new StringBuilder(); StringBuilder DepositoryName = new StringBuilder(); for (RoleAndDepository roleAndDepository : depositoryAndRole) { diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java index e5265dff..6df6f282 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java @@ -374,6 +374,7 @@ public class PlaceController { List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); // 查询当前用户管理的仓库 List depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); + depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition())); Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); Inventory inventoryById = materialService.findInventoryById(mid); List placeList = new ArrayList<>(); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index 6f1f7ac9..964c980a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/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 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 depositoryAndRole = roleService.findDepositoryAndRole(userByPort.getId()); + depositoryAndRole.addAll(roleService.findDepositoryAndRole(userByPort.getPosition())); for (RoleAndDepository depository : depositoryAndRole ) { diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java index 3834a169..04aee97f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java @@ -341,6 +341,7 @@ public class DepositoryServiceImpl implements DepositoryService { // 获取当前用户管理的仓库 List depositoryAndRole = roleMapper.findDepositoryAndRole(user.getId()); + depositoryAndRole.addAll(roleMapper.findDepositoryAndRole(user.getPosition())); List roleAndDepositoryList = new ArrayList<>(); depositoryParentIdList = new ArrayList<>(); @@ -975,7 +976,7 @@ public class DepositoryServiceImpl implements DepositoryService { // 获取当前用户管理的仓库 List depositoryAndRole = roleMapper.findDepositoryAndRole(userByPort.getId()); - + depositoryAndRole.addAll(roleMapper.findDepositoryAndRole(userByPort.getPosition())); Map paramForFindDepositoryId = new HashMap<>(); paramForFindDepositoryId.put("type", 1); paramForFindDepositoryId.put("uid", userByPort.getId()); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java index 511a2a30..6304710f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java @@ -608,6 +608,7 @@ public class GroupServiceImpl implements GroupService { // 查询当前用户管理的仓库 List depositoryAndRole = roleMapper.findDepositoryAndRole(userToken.getId()); + depositoryAndRole.addAll(roleMapper.findDepositoryAndRole(userToken.getPosition())); List depositoryIdList = new ArrayList<>(); for (Depository depository : depositoryByAdminorg diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java index 1b139076..57759467 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java @@ -648,6 +648,7 @@ public class RoleServiceImpl implements RoleService { } // 查询当前用户管理的仓库 List depositoryAndRole = roleMapper.findDepositoryAndRole(userToken.getId()); + depositoryAndRole.addAll(roleMapper.findDepositoryAndRole(userToken.getPosition())); for (RoleAndDepository depository : depositoryAndRole) { if (!depositoryIdList.contains(depository.getDepositoryId())) {