diff --git a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/bpm/controller/ActTaskController.java b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/bpm/controller/ActTaskController.java index 4d34245..396441f 100644 --- a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/bpm/controller/ActTaskController.java +++ b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/bpm/controller/ActTaskController.java @@ -563,7 +563,7 @@ public class ActTaskController { taskInfo.put("assignee", assignee); LoginUser user = sysBaseAPI.getUserByName(assignee); taskInfo.put("assigneeName", user != null ? user.getRealname() : assignee); - List deptNames = sysBaseAPI.getDepartNamesByUsername(assignee); + List deptNames = sysBaseAPI.getNotWorkGroupDepartNamesByUsername(assignee); taskInfo.put("deptNames", deptNames != null ? deptNames : Collections.emptyList()); } else { taskInfo.put("assignee", ""); diff --git a/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java index 1d725e4..632c7c4 100644 --- a/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java +++ b/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java @@ -124,6 +124,13 @@ public interface ISysBaseAPI extends CommonAPI { */ List getDepartNamesByUsername(String username); + /** + * 9通过用户账号查询部门 name + * @param username + * @return 部门 name + */ + List getNotWorkGroupDepartNamesByUsername(String username); + /** 11查询所有的父级字典,按照create_time排序 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java index b129158..26613e9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java @@ -40,7 +40,17 @@ public interface SysDepartMapper extends BaseMapper { * @return */ public List queryDepartsByUsername(@Param("username") String username); - + + /** + * 根据用户名查询非工作组部门 + * + * @param username + * @return + */ + public List queryNotWorkGroupDepartNamesByUsername(@Param("username") String username); + + public List queryDepartNamesByUsername(@Param("username") String username); + /** * 根据用户名查询部门 * diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml index 853e544..3c42b20 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml @@ -20,6 +20,25 @@ ) ) + + + + + + +