1.新增接口根据部门名查询该部门及其下辖部门员工

biz-base/src/main/java/com/dayou/controller/UserController.java

@@ -335,5 +335,15 @@ public class UserController extends BaseController {
         return RestResponse.data(ConvertUtil.copyList(userService.byAssetEvaluator(), PullDownModel.class));
     }
 
+    /**
+     * 根据部门名称获取部门及其下辖部门人员
+     * @param depName 部门
+     * @return RestResponse<List<PullDownModel>>
+     */
+    @GetMapping("/byDepartmentName/{depName}")
+    public RestResponse<List<PullDownModel>> byDepartmentName(@PathVariable("depName") String depName) {
+        return RestResponse.data(ConvertUtil.copyList(userService.byDepartmentName(depName), PullDownModel.class));
+    }
+
 }
 

dao/src/main/resources/mapper/UserMapper.xml

@@ -254,6 +254,12 @@
 
     <!--根据部门名称获取部门及其下辖部门人员-->
     <select id="byDepartmentName" resultType="com.dayou.entity.User">
-
+        SELECT DISTINCT user.id, user.name
+        FROM (SELECT user.id,user.name,post.department_id FROM user, user_post, post WHERE user.id = user_post.user_id AND user_post.post_id = post.id AND user.deleted = 0 AND user_post.deleted = 0 AND post.deleted = 0) AS user
+        INNER JOIN (SELECT id
+        FROM (SELECT id,parent_id FROM department WHERE deleted = 0 ORDER BY parent_id, id ) org_query,
+             (SELECT @id := (SELECT id FROM department WHERE name = #{depName} AND deleted = 0)) initialisation
+        WHERE (FIND_IN_SET(parent_id, @id) > 0 OR FIND_IN_SET(id, @id) > 0)
+                  AND @id := CONCAT(@id, ',', id)) AS depId ON depId.id = user.department_id
     </select>
 </mapper>

service/src/main/java/com/dayou/service/IUserService.java

@@ -112,4 +112,11 @@ public interface IUserService extends IService<User> {
      * @return List<User>
      */
     List<User> byAssetEvaluator();
+
+    /**
+     * 根据部门名称获取部门及其下辖部门人员
+     * @param depName 部门
+     * @return List<User>
+     */
+    List<User> byDepartmentName(String depName);
 }

service/src/main/java/com/dayou/service/impl/UserServiceImpl.java

@@ -621,6 +621,16 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     }
 
     /**
+     * 根据部门名称获取部门及其下辖部门人员
+     * @param depName 部门
+     * @return List<User>
+     */
+    @Override
+    public List<User> byDepartmentName(String depName) {
+        return userMapper.byDepartmentName(depName);
+    }
+
+    /**
      * 递归查询下级岗位
      * @param postIds
      * @param juniorPost