diff --git a/basic-interface/src/main/java/ink/wgink/interfaces/department/IDepartmentBaseService.java b/basic-interface/src/main/java/ink/wgink/interfaces/department/IDepartmentBaseService.java index 5face5c8..d86f24a2 100644 --- a/basic-interface/src/main/java/ink/wgink/interfaces/department/IDepartmentBaseService.java +++ b/basic-interface/src/main/java/ink/wgink/interfaces/department/IDepartmentBaseService.java @@ -166,6 +166,15 @@ public interface IDepartmentBaseService { */ List listZTree(String departmentParentId, Map params); + /** + * zTree组织部门 + * + * @param departmentParentId + * @param departmentType + * @return + */ + List listZTree(String departmentParentId, Integer departmentType); + /** * zTree组织部门 * diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentServiceImpl.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentServiceImpl.java index f68de9dc..6ee9d4cf 100644 --- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentServiceImpl.java +++ b/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 listZTree(String departmentParentId, Integer departmentType) { + Map params = getHashMap(4); + params.put("id", departmentParentId); + params.put("departmentType", departmentType); + return listZTree(params); + } + @Override public List listZTreeByAreaCodeAndParentId(String departmentAreaCode, String departmentParentId) { Map params = getHashMap(4); diff --git a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java index 3851a5eb..0d094522 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java +++ b/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 listZTree(String departmentParentId, Integer departmentType) { + Map params = getHashMap(4); + params.put("departmentParentId", departmentParentId); + params.put("departmentType", departmentType); + return listZTree(params); + } + @Override public List listZTreeByAreaCodeAndParentId(String departmentAreaCode, String departmentParentId) { Map params = getHashMap(4); diff --git a/service-department/src/main/resources/mybatis/mapper/department-mapper.xml b/service-department/src/main/resources/mybatis/mapper/department-mapper.xml index 60c4be47..38f046db 100644 --- a/service-department/src/main/resources/mybatis/mapper/department-mapper.xml +++ b/service-department/src/main/resources/mybatis/mapper/department-mapper.xml @@ -293,6 +293,10 @@ AND department_area_code = #{departmentAreaCode} + + AND + department_type = #{departmentType} + ORDER BY department_order