From d4f526e69455ece74ec624998dd3739e7b572d3d Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Sat, 22 Jul 2023 09:51:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E5=8F=96=E6=B6=88=E4=B8=AA?=
 =?UTF-8?q?=E5=88=AB=E6=8E=A5=E5=8F=A3=E7=9A=84=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GroupServiceImpl.java        | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

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 e79dabf9..1b62a58f 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
@@ -5,6 +5,8 @@ import com.dreamchaser.depository_manage.config.PublicConfig;
 import com.dreamchaser.depository_manage.entity.*;
 import com.dreamchaser.depository_manage.exception.MyException;
 import com.dreamchaser.depository_manage.depository_mapper.*;
+import com.dreamchaser.depository_manage.hrNew_mapper.AdministrativeMapper;
+import com.dreamchaser.depository_manage.hrNew_mapper.UserMapper;
 import com.dreamchaser.depository_manage.pojo.*;
 import com.dreamchaser.depository_manage.security.pool.RedisPool;
 import com.dreamchaser.depository_manage.security.pool.SendQyWxMessageThreadPool;
@@ -27,38 +29,44 @@ import java.util.concurrent.*;
 public class GroupServiceImpl implements GroupService {
 
     @Autowired
-    GroupMapper groupMapper;
+    private  GroupMapper groupMapper;
 
     @Autowired
-    MaterialMapper materialMapper;
+    private MaterialMapper materialMapper;
 
     @Autowired
-    DepositoryRecordMapper depositoryRecordMapper;
+    private DepositoryRecordMapper depositoryRecordMapper;
 
     @Autowired
-    DepositoryRecordService depositoryRecordService;
+    private DepositoryRecordService depositoryRecordService;
 
     @Autowired
-    DepositoryMapper depositoryMapper;
+    private DepositoryMapper depositoryMapper;
     @Autowired
-    RedissonClient redissonClient;
+    private RedissonClient redissonClient;
     @Autowired
-    RedisPool redisPool;
+    private RedisPool redisPool;
 
     @Autowired
-    SplitUnitMapper splitUnitMapper;
+    private SplitUnitMapper splitUnitMapper;
 
     @Autowired
-    SplitUnitService splitUnitService;
+    private SplitUnitService splitUnitService;
 
     @Autowired
-    PlaceMapper placeMapper;
+    private PlaceMapper placeMapper;
 
     @Autowired
-    RoleMapper roleMapper;
+    private RoleMapper roleMapper;
 
     @Autowired
-    QyWxOperationService qyWxOperationService;
+    private QyWxOperationService qyWxOperationService;
+
+    @Autowired
+    private UserMapper userMapper;
+
+    @Autowired
+    private AdministrativeMapper administrativeMapper;
 
     /**
      * 用于查找所有组合
@@ -711,7 +719,7 @@ public class GroupServiceImpl implements GroupService {
         paramForOut.put("state", "待部门负责人审核");
         paramForOut.put("applyRemark", map.get("applyRemark"));
         // 获取当前部门名称
-        Administration company = PublicConfig.getCompany(userToken.getMaindeparment(), userKey, token);
+        Administration company = administrativeMapper.findAdministrationById(userToken.getMaindeparment());
         // 构造出库订单编码
         String code = createOutCode("outOrderNumber", company.getName());
         paramForOut.put("code", code);
@@ -860,7 +868,7 @@ public class GroupServiceImpl implements GroupService {
                 for (RoleAndMaterialType mt : materialTypeIdForIn
                 ) {
                     // 获取管理员数据
-                    UserByPort userByPort = PublicConfig.FindUserById(mt.getUid(), userKey, token);
+                    UserByPort userByPort = userMapper.findUserById(mt.getUid());
                     // 获取用户的用工关系
                     int emptype = userByPort.getEmptype();
                     if(emptype > 10){