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 b98504ec..01c46fd1 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 @@ -149,6 +149,16 @@ public interface IDepartmentBaseService { */ SuccessResultList> listPageSubAllByAreaCode(String departmentAreaCode, ListPage page); + /** + * 组织部门子列表 + * + * @param departmentAreaCode 部门地区编码 + * @param type 部门类别 + * @param page + * @return + */ + SuccessResultList> listPageSubAllByAreaCodeAndType(String departmentAreaCode, Integer departmentType, ListPage page); + /** * 组织部门列表,递归获取全部内容 * 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 be5ea1a9..e0e9ef99 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 @@ -142,6 +142,14 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart return listPage(page); } + @Override + public SuccessResultList> listPageSubAllByAreaCodeAndType(String departmentAreaCode, Integer departmentType, ListPage page) { + page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + page.getParams().put("excludeDepartmentAreaCode", departmentAreaCode); + page.getParams().put("departmentType", departmentType); + return listPage(page); + } + @Override public List listAll(Map params) { return departmentRemoteService.listAll(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params); 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 fc5deee4..385d9d55 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 @@ -296,6 +296,14 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart return listPage(page); } + @Override + public SuccessResultList> listPageSubAllByAreaCodeAndType(String departmentAreaCode, Integer departmentType, ListPage page) { + page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + page.getParams().put("excludeDepartmentAreaCode", departmentAreaCode); + page.getParams().put("departmentType", departmentType); + return listPage(page); + } + @Override public DepartmentDTO get(String departmentId) { Map params = getHashMap(1);