!78 feat(bpm): 新增排除工作组部门的用户部门名查询接口

Merge pull request !78 from wsm/feature/query_dept_interface

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", "");

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排序

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);
+
 	/**
 	 * 根据用户名查询部门
 	 *

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">

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查询部门
      *

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

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) {