From 4f79d040967e1b9d24c8c52921e097e6a3a47948 Mon Sep 17 00:00:00 2001
From: wsm <2746563060@qq.com>
Date: Mon, 13 Jul 2026 14:27:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(bpm):=20=E6=96=B0=E5=A2=9E=E6=8E=92?=
 =?UTF-8?q?=E9=99=A4=E5=B7=A5=E4=BD=9C=E7=BB=84=E9=83=A8=E9=97=A8=E7=9A=84?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=83=A8=E9=97=A8=E5=90=8D=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 getNotWorkGroupDepartNamesByUsername，过滤 depart_type='4' 的工作组
- SQL 改为只查 depart_name，不再返回 SysDepart 实体，消除无效字段查询和循环转换
- 已有 getDepartNamesByUsername 同步优化为 name-only 查询
- ActTaskController 节点查询切换至新接口，排除工作组部门

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../bpm/controller/ActTaskController.java     |  2 +-
 .../jeecg/common/system/api/ISysBaseAPI.java  |  7 +++++++
 .../system/mapper/SysDepartMapper.java        | 12 +++++++++++-
 .../system/mapper/xml/SysDepartMapper.xml     | 19 +++++++++++++++++++
 .../system/service/ISysDepartService.java     | 12 +++++++++++-
 .../system/service/impl/SysBaseApiImpl.java   | 12 ++++++------
 .../service/impl/SysDepartServiceImpl.java    | 11 +++++++++++
 7 files changed, 66 insertions(+), 9 deletions(-)

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<String> deptNames = sysBaseAPI.getDepartNamesByUsername(assignee);
+						List<String> 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<String> getDepartNamesByUsername(String username);
 
+    /**
+     * 9通过用户账号查询部门 name
+     * @param username
+     * @return 部门 name
+     */
+    List<String> 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<SysDepart> {
 	 * @return
 	 */
 	public List<SysDepart> queryDepartsByUsername(@Param("username") String username);
-	
+
+	/**
+	 * 根据用户名查询非工作组部门
+	 *
+	 * @param username
+	 * @return
+	 */
+	public List<String> queryNotWorkGroupDepartNamesByUsername(@Param("username") String username);
+
+	public List<String> 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 @@
             )
         )
     </select>
+
+    <!-- 根据username查询所拥有的部门名称 -->
+    <select id="queryDepartNamesByUsername" parameterType="String" resultType="java.lang.String">
+        SELECT d.depart_name
+        FROM sys_user u
+            INNER JOIN sys_user_depart ud ON u.id = ud.user_id
+            INNER JOIN sys_depart d ON ud.dep_id = d.id
+        WHERE u.username = #{username}
+    </select>
+
+    <!-- 根据username查询非工作组部门名称 -->
+    <select id="queryNotWorkGroupDepartNamesByUsername" parameterType="String" resultType="java.lang.String">
+        SELECT d.depart_name
+        FROM sys_user u
+            INNER JOIN sys_user_depart ud ON u.id = ud.user_id
+            INNER JOIN sys_depart d ON ud.dep_id = d.id
+        WHERE u.username = #{username} and d.depart_type != '4'
+    </select>
+
     
     <!-- 根据username查询所拥有的部门 -->
     <select id="queryDepartsByUserId" parameterType="String" resultType="java.lang.String">
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java
index 912c819..6f54b29 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java
@@ -103,7 +103,17 @@ public interface ISysDepartService extends IService<SysDepart>{
      * @return
      */
     List<SysDepart> queryDepartsByUsername(String username);
-    
+
+    /**
+     * 根据用户名查询部门
+     *
+     * @param username
+     * @return
+     */
+    List<String> queryNotWorkGroupDepartNamesByUsername(String username);
+
+    List<String> queryDepartNamesByUsername(String username);
+
     /**
      * 根据用户ID查询部门
      *
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
index eca50b9..34baa00 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
@@ -385,12 +385,12 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 
 	@Override
 	public List<String> getDepartNamesByUsername(String username) {
-		List<SysDepart> list = sysDepartService.queryDepartsByUsername(username);
-		List<String> result = new ArrayList<>(list.size());
-		for (SysDepart depart : list) {
-			result.add(depart.getDepartName());
-		}
-		return result;
+		return sysDepartService.queryDepartNamesByUsername(username);
+	}
+
+	@Override
+	public List<String> getNotWorkGroupDepartNamesByUsername(String username) {
+		return sysDepartService.queryNotWorkGroupDepartNamesByUsername(username);
 	}
 
 	@Override
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
index dc962f5..38667ce 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
@@ -489,6 +489,17 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 	public List<SysDepart> queryDepartsByUsername(String username) {
 		return baseMapper.queryDepartsByUsername(username);
 	}
+
+	@Override
+	public List<String> queryNotWorkGroupDepartNamesByUsername(String username) {
+		return baseMapper.queryNotWorkGroupDepartNamesByUsername(username);
+	}
+
+	@Override
+	public List<String> queryDepartNamesByUsername(String username) {
+		return baseMapper.queryDepartNamesByUsername(username);
+	}
+
 	
 	@Override
 	public List<String> queryDepartsByUserId(String userId) {