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 cf657823..5face5c8 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 areaCode + * @param parentId + * @return + */ + List listZTreeByAreaCodeAndParentId(String areaCode, String parentId); + /** * 部门ID列表 * diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/department/IDepartmentUserRemoteService.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/department/IDepartmentUserRemoteService.java index b357f4bf..d428d4c9 100644 --- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/department/IDepartmentUserRemoteService.java +++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/department/IDepartmentUserRemoteService.java @@ -25,7 +25,7 @@ public interface IDepartmentUserRemoteService { @RemoteGetMethod("/list") List list(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map params); - @RemoteGetMethod("/list/{department}") + @RemoteGetMethod("/list/{departmentId}") List listByDepartmentId(@RemoteServerParams String userCenter, @RemotePathParams("departmentId") String departmentId, @RemoteQueryParams("access_token") String accessToken); @RemotePostMethod("/list/department-ids") 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 6938c0eb..f68de9dc 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 listZTreeByAreaCodeAndParentId(String departmentAreaCode, String departmentParentId) { + Map params = getHashMap(4); + params.put("departmentAreaCode", departmentAreaCode); + params.put("id", departmentParentId); + return listZTree(params); + } + @Override public List listId(Map params) { return departmentRemoteService.listId(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params); diff --git a/pom.xml b/pom.xml index 0cb6c177..bb3376f9 100644 --- a/pom.xml +++ b/pom.xml @@ -528,8 +528,16 @@ maven-snapshots http://121.36.71.250:8888/repository/maven-snapshots/ + + ${project.artifactId} 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 cfcf1428..3851a5eb 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 listZTreeByAreaCodeAndParentId(String departmentAreaCode, String departmentParentId) { + Map params = getHashMap(4); + params.put("departmentAreaCode", departmentAreaCode); + params.put("departmentParentId", departmentParentId); + return listZTree(params); + } + @Override public List listId(Map params) { List departmentIds = new ArrayList<>(); 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 96ab006e..60c4be47 100644 --- a/service-department/src/main/resources/mybatis/mapper/department-mapper.xml +++ b/service-department/src/main/resources/mybatis/mapper/department-mapper.xml @@ -289,6 +289,10 @@ #{departmentIds[${index}]} + + AND + department_area_code = #{departmentAreaCode} + ORDER BY department_order