浏览代码

获取子部门部门主任

lamphua 1 个月前
父节点
当前提交
e86e4b0e76

+ 2
- 0
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java 查看文件

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

+ 11
- 3
oa-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java 查看文件

@@ -130,7 +130,7 @@ public interface SysUserPostMapper
130 130
      * @param
131 131
      * @return 查询子公司执行董事
132 132
      */
133
-    public SysUser selectSubLeaderByDeptId(String userId);
133
+    public SysUser selectSubLeaderByDeptId(String deptId);
134 134
 
135 135
     /**
136 136
      * 查询子公司总经理
@@ -138,7 +138,7 @@ public interface SysUserPostMapper
138 138
      * @param
139 139
      * @return 查询子公司总经理
140 140
      */
141
-    public SysUser selectSubGmByDeptId(String userId);
141
+    public SysUser selectSubGmByDeptId(String deptId);
142 142
 
143 143
     /**
144 144
      * 查询分公司经理
@@ -146,7 +146,15 @@ public interface SysUserPostMapper
146 146
      * @param
147 147
      * @return 查询分公司经理
148 148
      */
149
-    public SysUser selectBranchLeaderByDeptId(String userId);
149
+    public SysUser selectBranchLeaderByDeptId(String deptId);
150
+
151
+    /**
152
+     * 查询部门主任
153
+     *
154
+     * @param
155
+     * @return 查询部门主任
156
+     */
157
+    public SysUser selectParentDeptLeaderByDeptId(String deptId);
150 158
 
151 159
     /**
152 160
      * 查询部门主任

+ 11
- 3
oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java 查看文件

@@ -186,7 +186,7 @@ public interface ISysPostService
186 186
      * @param
187 187
      * @return 查询子公司执行董事
188 188
      */
189
-    public SysUser selectSubLeaderByDeptId(String userId);
189
+    public SysUser selectSubLeaderByDeptId(String deptId);
190 190
 
191 191
     /**
192 192
      * 查询子公司总经理
@@ -194,7 +194,7 @@ public interface ISysPostService
194 194
      * @param
195 195
      * @return 查询子公司总经理
196 196
      */
197
-    public SysUser selectSubGmByDeptId(String userId);
197
+    public SysUser selectSubGmByDeptId(String deptId);
198 198
 
199 199
     /**
200 200
      * 查询分公司经理
@@ -202,7 +202,15 @@ public interface ISysPostService
202 202
      * @param
203 203
      * @return 查询分公司经理
204 204
      */
205
-    public SysUser selectBranchLeaderByDeptId(String userId);
205
+    public SysUser selectBranchLeaderByDeptId(String deptId);
206
+
207
+    /**
208
+     * 查询部门主任
209
+     *
210
+     * @param
211
+     * @return 查询部门主任
212
+     */
213
+    public SysUser selectParentDeptLeaderByDeptId(String deptId);
206 214
 
207 215
     /**
208 216
      * 查询部门主任

+ 17
- 6
oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java 查看文件

@@ -306,8 +306,8 @@ public class SysPostServiceImpl implements ISysPostService
306 306
      * @return 查询子公司总经理
307 307
      */
308 308
     @Override
309
-    public SysUser selectSubGmByDeptId(String userId) {
310
-        return userPostMapper.selectSubGmByDeptId(userId);
309
+    public SysUser selectSubGmByDeptId(String deptId) {
310
+        return userPostMapper.selectSubGmByDeptId(deptId);
311 311
     }
312 312
 
313 313
     /**
@@ -317,8 +317,19 @@ public class SysPostServiceImpl implements ISysPostService
317 317
      * @return 查询分公司经理
318 318
      */
319 319
     @Override
320
-    public SysUser selectBranchLeaderByDeptId(String userId) {
321
-        return userPostMapper.selectBranchLeaderByDeptId(userId);
320
+    public SysUser selectBranchLeaderByDeptId(String deptId) {
321
+        return userPostMapper.selectBranchLeaderByDeptId(deptId);
322
+    }
323
+
324
+    /**
325
+     * 查询部门主任
326
+     *
327
+     * @param
328
+     * @return 查询部门主任
329
+     */
330
+    @Override
331
+    public SysUser selectParentDeptLeaderByDeptId(String deptId) {
332
+        return userPostMapper.selectParentDeptLeaderByDeptId(deptId);
322 333
     }
323 334
 
324 335
     /**
@@ -339,8 +350,8 @@ public class SysPostServiceImpl implements ISysPostService
339 350
      * @return 查询部门主任
340 351
      */
341 352
     @Override
342
-    public List<SysUser> selectDeptLeadersByDeptId(String userId) {
343
-        return userPostMapper.selectDeptLeadersByDeptId(userId);
353
+    public List<SysUser> selectDeptLeadersByDeptId(String deptId) {
354
+        return userPostMapper.selectDeptLeadersByDeptId(deptId);
344 355
     }
345 356
 
346 357
     /**

+ 10
- 1
oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml 查看文件

@@ -209,7 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
209 209
 		select r.user_id, r.nick_name from
210 210
 		(select u.dept_id, d.parent_id, u1.user_id, u1.nick_name from sys_user as u
211 211
 		left join sys_dept as d on d.dept_id = u.dept_id
212
-		left join sys_user as u1 on u1.dept_id = d.parent_id where u.user_id = 121) as r
212
+		left join sys_user as u1 on u1.dept_id = d.parent_id where u.user_id = #{param}) as r
213 213
 		left join sys_user_post as up on r.user_id = up.user_id
214 214
 		left join sys_post as p on p.post_id = up.post_id
215 215
 		where p.post_name = '主任'
@@ -251,6 +251,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
251 251
 		where p.post_name = '经理'
252 252
 	</select>
253 253
 
254
+	<select id="selectParentDeptLeaderByDeptId" parameterType="String" resultMap="SysUserResult">
255
+		select u.user_id, u.nick_name from sys_dept as d
256
+		left join sys_dept as d1 on d1.dept_id = d.parent_id
257
+		left join sys_user as u on u.dept_id = d.parent_id
258
+		left join sys_user_post as up on u.user_id = up.user_id
259
+		left join sys_post as p on p.post_id = up.post_id
260
+		where p.post_name = '主任' and d.dept_id = #{param}
261
+	</select>
262
+
254 263
 	<select id="selectDeptLeaderByDeptId" parameterType="String" resultMap="SysUserResult">
255 264
 		select r.user_id, r.nick_name from
256 265
 		(select user_id, nick_name, dept_id from

+ 1
- 1
oa-ui/src/views/oa/project/info.vue 查看文件

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

正在加载...
取消
保存