From 8fe9151f7ecb506a8e5ad23c44a48afcde9029e8 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 15 Oct 2024 16:08:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=83=A8=E9=97=A8=E8=B4=9F?=
 =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E6=97=B6=E5=A2=9E=E5=8A=A0=E9=80=80=E4=BC=91?=
 =?UTF-8?q?=E7=A6=BB=E8=81=8C=E7=AD=89=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../depository_manage/hrNew_mapper/UserMapper.xml         | 2 +-
 .../depository_manage/service/impl/UserServiceImpl.java   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.xml b/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.xml
index 64ae89c..e5bcf10 100644
--- a/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.xml
@@ -91,7 +91,7 @@
         select
         <include refid="manContAllColumn"/>
         from man_cont
-        where FIND_IN_SET(#{departmentId},responsible_department)
+        where emp_type in (1,2,3,4,5,6,7,8) and FIND_IN_SET(#{departmentId},responsible_department)
     </select>
 
     <select id="findUserByWorkWechat" parameterType="String" resultMap="userMap">
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/UserServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/UserServiceImpl.java
index 79aa63e..62e0415 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/UserServiceImpl.java
@@ -100,11 +100,11 @@ public class UserServiceImpl implements UserService {
         // 用于存储结果集
         List<UserByPort> userByPortList = new ArrayList<>();
         Long administrationId = administration.getId();
-        if (Long.compare(administrationId, 111) == 0) {
+        /*if (Long.compare(administrationId, 111) == 0) {
             // 如果是获取保卫部的负责人，则直接获取该用户
             UserByPort userByNumber = userMapper.findUserByNumber("301350");
             userByPortList.add(userByNumber);
-        }
+        }*/
 
         // 查询数据库中当前部门的负责人
         List<UserByPort> departmentHeaders = userMapper.findDepartmentHeaders(administrationId);
@@ -132,11 +132,11 @@ public class UserServiceImpl implements UserService {
 
         // 用于存储结果集
         List<UserByPort> userByPortList = new ArrayList<>();
-        if (Long.compare(administrationId, 111) == 0) {
+        /*if (Long.compare(administrationId, 111) == 0) {
             // 如果是获取保卫部的负责人，则直接获取该用户
             UserByPort userByNumber = userMapper.findUserByNumber("301350");
             userByPortList.add(userByNumber);
-        }
+        }*/
         // 查询数据库中当前部门的负责人
         List<UserByPort> departmentHeaders = userMapper.findDepartmentHeaders(administrationId);
         for (UserByPort departmentHeader : departmentHeaders) {