From 0972f7b3ccea8630f0b25e8b671bbacce7268da6 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Wed, 12 Jul 2023 13:43:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=92=E5=BA=8F=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DepositoryRecordController.java | 11 +++++++- .../impl/DepositoryRecordServiceImpl.java | 25 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index c2967584..3aefa302 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -1136,6 +1136,11 @@ public class DepositoryRecordController { continue; } UserByPort departmenthead = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(value), userKey, token); + // 获取用户的用工关系 + int emptype = departmenthead.getEmptype(); + if (emptype > 10) { + continue; + } if ("".equals(useAdminorgName)) { useAdminorgName = departmenthead.getMaindeparmentname(); } else { @@ -1484,7 +1489,11 @@ public class DepositoryRecordController { for (String manager : managersSplit) { if (!"".equals(manager)) { UserByPort userByPort = PublicConfig.FindUserById(Integer.parseInt(manager), userKey, token); - + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if (emptype > 10) { + continue; + } if (!managerList.contains(userByPort)) { managerList.add(userByPort); } 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 80ed5d9f..5b085e17 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 @@ -1935,6 +1935,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { ) { // 获取管理员数据 UserByPort userByPort = PublicConfig.FindUserById(mt.getUid(), userKey, token); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if (emptype > 10) { + continue; + } String workwechat = userByPort.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); @@ -1948,6 +1953,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { ) { // 获取管理员数据 UserByPort userByPort = PublicConfig.FindUserById(mt.getUserId(), userKey, token); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if (emptype > 10) { + continue; + } String workwechat = userByPort.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); @@ -2352,6 +2362,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } Integer uid = ObjectFormatUtil.toInteger(s); UserByPort depositoryManager = PublicConfig.FindUserById(uid, userKey, token); + // 获取用户的用工关系 + int emptype = depositoryManager.getEmptype(); + if (emptype > 10) { + continue; + } String workwechat = depositoryManager.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = depositoryManager.getWechat(); @@ -2543,6 +2558,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { for (Integer integer : userIdByMtId) { // 获取仓库管理员信息 UserByPort manager = PublicConfig.FindUserById(integer, userKey, token); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if (emptype > 10) { + continue; + } updateRedisDataForUserManager(integer, minRecordKey); minRecordManage.append(integer).append(","); String workwechat = manager.getWorkwechat(); @@ -2623,6 +2643,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { updateRedisDataForUserManager(integer, minRecordKey); // 获取仓库管理员信息 UserByPort manager = PublicConfig.FindUserById(integer, userKey, token); + // 获取用户的用工关系 + int emptype = manager.getEmptype(); + if (emptype > 10) { + continue; + } minRecordManage.append(integer).append(","); String workwechat = manager.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) {