From d63a8fd097b29a1532cf9574dd124c018a6848f1 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Sat, 27 May 2023 13:55:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E8=B5=8B=E6=9D=83=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../depository_manage/controller/PageController.java      | 8 --------
 .../service/impl/MaterialServiceImpl.java                 | 4 ++--
 .../depository_manage/service/impl/RoleServiceImpl.java   | 3 +++
 3 files changed, 5 insertions(+), 10 deletions(-)

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 0f45d033..345f62c1 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
@@ -3107,14 +3107,6 @@ public class PageController {
     @GetMapping("/ScanBarOrQrCodeOut_selectMaterial")
     public ModelAndView ScanBarOrQrCodeOut_selectMaterial(Integer pid, String mcode, Integer depositoryId) {
         ModelAndView mv = new ModelAndView();
-        Map<String, Object> map = new HashMap<>();
-        map.put("depositoryId", depositoryId);
-        map.put("pid", pid);
-        List<Integer> midList = materialService.findInventoryForCompleteOutTask(map);
-        if (midList.size() > 0) {
-            List<Inventory> materialByIds = materialService.findMaterialByIds(midList);
-            mv.addObject("materialList", materialByIds);
-        }
         mv.addObject("mcode", mcode);
         mv.addObject("depositoryId", depositoryId);
         mv.addObject("pid", pid);
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
index 9c7b5dc3..892935b8 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
@@ -2660,7 +2660,7 @@ public class MaterialServiceImpl implements MaterialService {
                 MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0, inventory.getId());
                 if (placeAndMaterialByMidAndPid != null) {
                     // 如果是默认库位
-                    midList.add(placeAndMaterialByMidAndPid.getMid());
+                    midList.add(placeAndMaterialByMidAndPid.getMid()); // 获取库存id
                 }
             }
         } else {
@@ -2668,7 +2668,7 @@ public class MaterialServiceImpl implements MaterialService {
             map.put("placeId", pid);
             List<MaterialAndPlaceForViewP> placeAndMaterialByCondition = placeService.findPlaceAndMaterialByCondition(map);
             for (MaterialAndPlaceForViewP materialAndPlaceForViewP : placeAndMaterialByCondition) {
-                midList.add(materialAndPlaceForViewP.getIid());
+                midList.add(materialAndPlaceForViewP.getIid()); // 获取库存id
             }
 
         }
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 57759467..35c601d2 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
@@ -364,10 +364,12 @@ public class RoleServiceImpl implements RoleService {
                 // 用于查询当前可见的仓库id数量
                 Map<String, Object> paramForCount = new HashMap<>();
                 paramForCount.put("classes", paramForInsert.get("classes"));
+                paramForCount.put("depositoryIdList", map.get("roleIds"));
                 for (Object userId : userIds
                 ) {
                     paramForInsert.put("userid", userId);
                     paramForCount.put("userId", userId);
+                    // 获取当前用户拥有的
                     Integer paramCount = roleMapper.findRoleAndDepositoryCountByCondition(paramForCount);
                     result += (roleMapper.addUserOrPostRoleAndDepositorys(paramForInsert) + paramCount);
                 }
@@ -383,6 +385,7 @@ public class RoleServiceImpl implements RoleService {
                 // 用于查询当前可见的仓库id数量
                 Map<String, Object> paramForCount = new HashMap<>();
                 paramForCount.put("classes", paramForInsert.get("classes"));
+                paramForCount.put("uidList", map.get("roleIds"));
                 for (Object userId : userIds
                 ) {
                     paramForInsert.put("userid", userId);