新增接口

basic-interface/src/main/java/ink/wgink/interfaces/department/IDepartmentBaseService.java

@@ -166,6 +166,15 @@ public interface IDepartmentBaseService {
      */
     List<ZTreeDTO> listZTree(String departmentParentId, Map<String, Object> params);
 
+    /**
+     * zTree组织部门
+     *
+     * @param departmentParentId
+     * @param departmentType
+     * @return
+     */
+    List<ZTreeDTO> listZTree(String departmentParentId, Integer departmentType);
+
     /**
      * zTree组织部门
      *

login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentServiceImpl.java

@@ -151,6 +151,14 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
         return listZTree(params);
     }
 
+    @Override
+    public List<ZTreeDTO> listZTree(String departmentParentId, Integer departmentType) {
+        Map<String, Object> params = getHashMap(4);
+        params.put("id", departmentParentId);
+        params.put("departmentType", departmentType);
+        return listZTree(params);
+    }
+
     @Override
     public List<ZTreeDTO> listZTreeByAreaCodeAndParentId(String departmentAreaCode, String departmentParentId) {
         Map<String, Object> params = getHashMap(4);

service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java

@@ -327,6 +327,14 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
         return listZTree(params);
     }
 
+    @Override
+    public List<ZTreeDTO> listZTree(String departmentParentId, Integer departmentType) {
+        Map<String, Object> params = getHashMap(4);
+        params.put("departmentParentId", departmentParentId);
+        params.put("departmentType", departmentType);
+        return listZTree(params);
+    }
+
     @Override
     public List<ZTreeDTO> listZTreeByAreaCodeAndParentId(String departmentAreaCode, String departmentParentId) {
         Map<String, Object> params = getHashMap(4);

service-department/src/main/resources/mybatis/mapper/department-mapper.xml

@@ -293,6 +293,10 @@
         AND
             department_area_code = #{departmentAreaCode}
         </if>
+        <if test="departmentType != null and departmentType != ''">
+        AND
+            department_type = #{departmentType}
+        </if>
         ORDER BY
             department_order
     </select>