查询部门负责人时增加退休离职等判断

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">

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) {