Merge branch 'master' of http://oa.sccehui.com:6101/cmc-coding/cmc-oa

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -72,6 +72,9 @@ public class SysUserController extends BaseController
     {
         startPage();
         List<SysUser> list = userService.selectUserList(user);
+        if (user.getDeptId() != null && user.getDeptId() == 101L) {
+            list.addAll(postService.selectDsSecretary(user));
+        }
         if (user.getDeptId() != null && user.getDeptId() == 103L) {
             list = postService.selectGmAssistant(user);
         }

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/TreeSelectNew.java

@@ -45,6 +45,10 @@ public class TreeSelectNew implements Serializable
         sysUser.setDeptId(dept.getDeptId());
         SysUserMapper userMapper = SpringUtils.getBean(SysUserMapper.class);
         List<SysUser> list = userMapper.selectUserServingList(sysUser);
+        if (dept.getDeptId() == 101) {
+            SysUserPostMapper userPostMapper = SpringUtils.getBean(SysUserPostMapper.class);
+            list.addAll(userPostMapper.selectDsSecretary(new SysUser()));
+        }
         if (dept.getDeptId() == 103) {
             SysUserPostMapper userPostMapper = SpringUtils.getBean(SysUserPostMapper.class);
             list = userPostMapper.selectGmAssistant(new SysUser());

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java

@@ -52,6 +52,14 @@ public interface SysUserPostMapper
      */
     public List<SysUser> selectGmAssistant(SysUser user);
 
+    /**
+     * 查询董事会秘书集合
+     *
+     * @param
+     * @return 董事会秘书列表
+     */
+    public List<SysUser> selectDsSecretary(SysUser user);
+
     /**
      * 根据岗位查询用户
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java

@@ -108,6 +108,14 @@ public interface ISysPostService
      */
     public List<SysUser> selectGmAssistant(SysUser user);
 
+    /**
+     * 查询董事会秘书集合
+     *
+     * @param
+     * @return 董事会秘书列表
+     */
+    public List<SysUser> selectDsSecretary(SysUser user);
+
     /**
      * 根据岗位查询用户
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

@@ -189,6 +189,17 @@ public class SysPostServiceImpl implements ISysPostService
         return userPostMapper.selectGmAssistant(user);
     }
 
+    /**
+     * 查询董事会秘书集合
+     *
+     * @param
+     * @return 董事会秘书列表
+     */
+    @Override
+    public List<SysUser> selectDsSecretary(SysUser user) {
+        return userPostMapper.selectDsSecretary(user);
+    }
+
     /**
      * 根据岗位查询用户
      *

oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml

@@ -63,6 +63,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where up.post_id = 31 and u.status = '0'
 	</select>
 
+	<select id="selectDsSecretary" parameterType="SysUser" resultMap="SysUserResult">
+		select u.*, d.dept_name
+		from sys_user u
+		left join sys_dept d on u.dept_id = d.dept_id
+		left join sys_user_post up on u.user_id = up.user_id
+		left join sys_post p on up.post_id = p.post_id
+		where p.post_name = "秘书"
+	</select>
+
 	<select id="selectGmAssistant" parameterType="SysUser" resultMap="SysUserResult">
 		select u.*, d.dept_name
 		from sys_user u