获取子部门部门主任

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

@@ -115,6 +115,8 @@ public class SysPostController extends BaseController
             deptLeader = postService.selectSubGmByDeptId(deptId);
         if (deptLeader == null)
             deptLeader = postService.selectBranchLeaderByDeptId(deptId);
+        if (deptLeader == null)
+            deptLeader = postService.selectParentDeptLeaderByDeptId(deptId);
         return success(deptLeader);
     }
 

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

@@ -130,7 +130,7 @@ public interface SysUserPostMapper
      * @param
      * @return 查询子公司执行董事
      */
-    public SysUser selectSubLeaderByDeptId(String userId);
+    public SysUser selectSubLeaderByDeptId(String deptId);
 
     /**
      * 查询子公司总经理
@@ -138,7 +138,7 @@ public interface SysUserPostMapper
      * @param
      * @return 查询子公司总经理
      */
-    public SysUser selectSubGmByDeptId(String userId);
+    public SysUser selectSubGmByDeptId(String deptId);
 
     /**
      * 查询分公司经理
@@ -146,7 +146,15 @@ public interface SysUserPostMapper
      * @param
      * @return 查询分公司经理
      */
-    public SysUser selectBranchLeaderByDeptId(String userId);
+    public SysUser selectBranchLeaderByDeptId(String deptId);
+
+    /**
+     * 查询部门主任
+     *
+     * @param
+     * @return 查询部门主任
+     */
+    public SysUser selectParentDeptLeaderByDeptId(String deptId);
 
     /**
      * 查询部门主任

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

@@ -186,7 +186,7 @@ public interface ISysPostService
      * @param
      * @return 查询子公司执行董事
      */
-    public SysUser selectSubLeaderByDeptId(String userId);
+    public SysUser selectSubLeaderByDeptId(String deptId);
 
     /**
      * 查询子公司总经理
@@ -194,7 +194,7 @@ public interface ISysPostService
      * @param
      * @return 查询子公司总经理
      */
-    public SysUser selectSubGmByDeptId(String userId);
+    public SysUser selectSubGmByDeptId(String deptId);
 
     /**
      * 查询分公司经理
@@ -202,7 +202,15 @@ public interface ISysPostService
      * @param
      * @return 查询分公司经理
      */
-    public SysUser selectBranchLeaderByDeptId(String userId);
+    public SysUser selectBranchLeaderByDeptId(String deptId);
+
+    /**
+     * 查询部门主任
+     *
+     * @param
+     * @return 查询部门主任
+     */
+    public SysUser selectParentDeptLeaderByDeptId(String deptId);
 
     /**
      * 查询部门主任

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

@@ -306,8 +306,8 @@ public class SysPostServiceImpl implements ISysPostService
      * @return 查询子公司总经理
      */
     @Override
-    public SysUser selectSubGmByDeptId(String userId) {
-        return userPostMapper.selectSubGmByDeptId(userId);
+    public SysUser selectSubGmByDeptId(String deptId) {
+        return userPostMapper.selectSubGmByDeptId(deptId);
     }
 
     /**
@@ -317,8 +317,19 @@ public class SysPostServiceImpl implements ISysPostService
      * @return 查询分公司经理
      */
     @Override
-    public SysUser selectBranchLeaderByDeptId(String userId) {
-        return userPostMapper.selectBranchLeaderByDeptId(userId);
+    public SysUser selectBranchLeaderByDeptId(String deptId) {
+        return userPostMapper.selectBranchLeaderByDeptId(deptId);
+    }
+
+    /**
+     * 查询部门主任
+     *
+     * @param
+     * @return 查询部门主任
+     */
+    @Override
+    public SysUser selectParentDeptLeaderByDeptId(String deptId) {
+        return userPostMapper.selectParentDeptLeaderByDeptId(deptId);
     }
 
     /**
@@ -339,8 +350,8 @@ public class SysPostServiceImpl implements ISysPostService
      * @return 查询部门主任
      */
     @Override
-    public List<SysUser> selectDeptLeadersByDeptId(String userId) {
-        return userPostMapper.selectDeptLeadersByDeptId(userId);
+    public List<SysUser> selectDeptLeadersByDeptId(String deptId) {
+        return userPostMapper.selectDeptLeadersByDeptId(deptId);
     }
 
     /**

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

@@ -209,7 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select r.user_id, r.nick_name from
 		(select u.dept_id, d.parent_id, u1.user_id, u1.nick_name from sys_user as u
 		left join sys_dept as d on d.dept_id = u.dept_id
-		left join sys_user as u1 on u1.dept_id = d.parent_id where u.user_id = 121) as r
+		left join sys_user as u1 on u1.dept_id = d.parent_id where u.user_id = #{param}) as r
 		left join sys_user_post as up on r.user_id = up.user_id
 		left join sys_post as p on p.post_id = up.post_id
 		where p.post_name = '主任'
@@ -251,6 +251,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where p.post_name = '经理'
 	</select>
 
+	<select id="selectParentDeptLeaderByDeptId" parameterType="String" resultMap="SysUserResult">
+		select u.user_id, u.nick_name from sys_dept as d
+		left join sys_dept as d1 on d1.dept_id = d.parent_id
+		left join sys_user as u on u.dept_id = d.parent_id
+		left join sys_user_post as up on u.user_id = up.user_id
+		left join sys_post as p on p.post_id = up.post_id
+		where p.post_name = '主任' and d.dept_id = #{param}
+	</select>
+
 	<select id="selectDeptLeaderByDeptId" parameterType="String" resultMap="SysUserResult">
 		select r.user_id, r.nick_name from
 		(select user_id, nick_name, dept_id from

oa-ui/src/views/oa/project/info.vue

@@ -142,7 +142,7 @@
               <div>
                 <el-table :data="workList">
                   <el-table-column type="index" width="50" />
-                  <el-table-column label="工作内容" prop="content" />
+                  <el-table-column label="工作内容" prop="content" width="600" />
                   <el-table-column label="等级或比例尺" prop="scale" />
                   <el-table-column label="单位" prop="unit" />
                   <el-table-column label="工作量" prop="workload" />