Merge branch 'master' of git.yfzx.zjtys.com.cn:zjm/notes2.0

notes-pas/src/main/java/com/zjty/tynotes/pas/service/IUserService.java

@@ -2,6 +2,7 @@ package com.zjty.tynotes.pas.service;
 
 import com.zjty.tynotes.pas.entity.Department;
 import com.zjty.tynotes.pas.entity.User;
+import com.zjty.tynotes.pas.entity.vo.JobLeads;
 import com.zjty.tynotes.pas.entity.vo.PageRequest;
 import com.zjty.tynotes.pas.entity.vo.PageResponse;
 import io.swagger.annotations.ApiModel;
@@ -161,4 +162,12 @@ public interface IUserService {
      * @return
      */
     boolean judgeParent(String id, String userId);
+
+
+    /**
+     * 根据人员id返回总监，总经理、副经理id集合
+     * @param executorId
+     * @return
+     */
+    JobLeads findJobLeads(String executorId);
 }

notes-pas/src/main/java/com/zjty/tynotes/pas/service/impl/UserServiceImpl.java

@@ -689,6 +689,7 @@ public class UserServiceImpl implements IUserService {
    }
 
 
+   @Override
    public JobLeads findJobLeads(String executorId){
        JobLeads jobLeads = new JobLeads();
        List<String> majordomos = new ArrayList<>();