Browse Source

人员根据公司id查询接口

chenc 4 years ago
parent
commit
28115a3074

+ 2 - 2
src/main/java/org/jeecg/modules/basedata/controller/FdPersonnelController.java

@@ -329,9 +329,9 @@ public class FdPersonnelController {
      * @return org.jeecg.common.api.vo.Result<org.jeecg.modules.basedata.entity.BmPersonnelTree>
      **/
     @GetMapping(value = "/queryApprover")
-    public Result<List<FdPersonnelTree>> queryApprover() {
+    public Result<List<FdPersonnelTree>> queryApprover(String pkOrg) {
         Result<List<FdPersonnelTree>> result = new Result<List<FdPersonnelTree>>();
-        List<FdPersonnel> list = fdPersonnelService.queryApprover();
+        List<FdPersonnel> list = fdPersonnelService.queryApprover(pkOrg);
         fdPersonnelServiceimpl.getRoleByPersonnelList(list);
         List<FdPersonnelTree> treeLists=new ArrayList<FdPersonnelTree>();
         getTreeList(treeLists,list,null);

+ 1 - 1
src/main/java/org/jeecg/modules/basedata/mapper/FdPersonnelMapper.java

@@ -25,7 +25,7 @@ public interface FdPersonnelMapper extends BaseMapper<FdPersonnel> {
 
     FdPersonnel getByIdPersonnel(@Param("id")String id);
 
-    public List<FdPersonnel> queryApprover();
+    public List<FdPersonnel> queryApprover(@Param("pkOrg")String pkOrg);
 
     List<FdPersonnel> getPersonnelByRole(@Param("roleId") String roleId);
 

+ 3 - 1
src/main/java/org/jeecg/modules/basedata/mapper/xml/FdPersonnelMapper.xml

@@ -168,7 +168,9 @@
             LEFT JOIN sys_depart sd ON a.pk_org = sd.id
         WHERE
             a.del_flag = 0
-            AND a.pk_org != 'fe33687fb0a645ccb71a2873460a3d7d'
+            <if test="pkOrg !=null and pkOrg!=''">
+                AND a.pk_org =#{pkOrg}
+            </if>
             AND TRIM( sd.id ) != ''
             ) t1
         ORDER BY

+ 1 - 1
src/main/java/org/jeecg/modules/basedata/service/IFdPersonnelService.java

@@ -25,7 +25,7 @@ public interface IFdPersonnelService extends IService<FdPersonnel> {
      * licc 查询审批人员信息
      * @return
      */
-    public List<FdPersonnel> queryApprover();
+    public List<FdPersonnel> queryApprover(String pkOrg);
 
     List<FdPersonnel> getPersonnelByRole(String roleId);
 

+ 2 - 2
src/main/java/org/jeecg/modules/basedata/service/impl/FdPersonnelServiceImpl.java

@@ -70,8 +70,8 @@ public class FdPersonnelServiceImpl extends ServiceImpl<FdPersonnelMapper, FdPer
     }
 
     @Override
-    public List<FdPersonnel> queryApprover() {
-        return fdPersonnelMapper.queryApprover();
+    public List<FdPersonnel> queryApprover(String pkOrg) {
+        return fdPersonnelMapper.queryApprover(pkOrg);
     }
 
     /***