From 3da1d02e1e82c752690be98498e90149f0b7cbc9 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Sat, 6 Nov 2021 17:40:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9C=B0=E5=8C=BA=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=83=A8=E9=97=A8=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../department/IDepartmentBaseService.java | 41 +++++++++++++++---- .../impl/DepartmentServiceImpl.java | 34 ++++++++++++--- .../DepartmentResourceController.java | 5 +-- .../service/impl/DepartmentServiceImpl.java | 30 ++++++++++++-- .../mybatis/mapper/department-mapper.xml | 12 +++++- 5 files changed, 99 insertions(+), 23 deletions(-) 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 8c1c80e0..2344ac77 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 @@ -33,18 +33,34 @@ public interface IDepartmentBaseService { /** * 部门列表 * - * @param areaCode + * @param departmentParentId * @return */ - List listByAreaCode(String areaCode); + List listByParentId(String departmentParentId); /** * 部门列表 * - * @param areaCode + * @param departmentAreaCode * @return */ - List listAllByAreaCode(String areaCode); + List listByAreaCode(String departmentAreaCode); + + /** + * 部门列表 + * + * @param departmentAreaCode + * @return + */ + List listAllByAreaCode(String departmentAreaCode); + + /** + * 部门全部子列表 + * + * @param departmentAreaCode + * @return + */ + List listSubAllByAreaCode(String departmentAreaCode); /** * 通过ID获取组织部门详情 @@ -74,20 +90,29 @@ public interface IDepartmentBaseService { /** * 组织部门列表 * - * @param departmentParentId + * @param departmentAreaCode * @param page * @return */ - SuccessResultList> listPageByAreaCode(String areaCode, ListPage page); + SuccessResultList> listPageByAreaCode(String departmentAreaCode, ListPage page); /** * 组织部门列表 * - * @param departmentParentId + * @param departmentAreaCode * @param page * @return */ - SuccessResultList> listPageAllByAreaCode(String areaCode, ListPage page); + SuccessResultList> listPageAllByAreaCode(String departmentAreaCode, ListPage page); + + /** + * 组织部门子列表 + * + * @param departmentAreaCode + * @param page + * @return + */ + SuccessResultList> listPageSubAllByAreaCode(String departmentAreaCode, 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 3b50ebbf..e1c5a7e4 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 @@ -44,16 +44,31 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart } @Override - public List listByAreaCode(String areaCode) { + public List listByParentId(String departmentParentId) { Map params = getHashMap(2); - params.put("departmentAreaCode", areaCode); + params.put("departmentParentId", departmentParentId); return list(params); } @Override - public List listAllByAreaCode(String areaCode) { + public List listByAreaCode(String departmentAreaCode) { Map params = getHashMap(2); - params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); + params.put("departmentAreaCode", departmentAreaCode); + return list(params); + } + + @Override + public List listAllByAreaCode(String departmentAreaCode) { + Map params = getHashMap(2); + params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + return list(params); + } + + @Override + public List listSubAllByAreaCode(String departmentAreaCode) { + Map params = getHashMap(4); + params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + params.put("excludeDepartmentAreaCode", departmentAreaCode); return list(params); } @@ -80,8 +95,15 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart } @Override - public SuccessResultList> listPageAllByAreaCode(String areaCode, ListPage page) { - page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); + public SuccessResultList> listPageAllByAreaCode(String departmentAreaCode, ListPage page) { + page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + return listPage(page); + } + + @Override + public SuccessResultList> listPageSubAllByAreaCode(String departmentAreaCode, ListPage page) { + page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + page.getParams().put("excludeDepartmentAreaCode", departmentAreaCode); return listPage(page); } diff --git a/service-department/src/main/java/ink/wgink/service/department/controller/resources/DepartmentResourceController.java b/service-department/src/main/java/ink/wgink/service/department/controller/resources/DepartmentResourceController.java index cc24e781..e6c1a587 100644 --- a/service-department/src/main/java/ink/wgink/service/department/controller/resources/DepartmentResourceController.java +++ b/service-department/src/main/java/ink/wgink/service/department/controller/resources/DepartmentResourceController.java @@ -16,7 +16,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -42,7 +41,7 @@ public class DepartmentResourceController extends DefaultBaseController { @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("list") public List list() { - Map params = new HashMap<>(0); + Map params = requestParams(); return departmentService.list(params); } @@ -53,7 +52,7 @@ public class DepartmentResourceController extends DefaultBaseController { @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("list/{departmentParentId}") public List list(@PathVariable("departmentParentId") String departmentParentId) { - Map params = new HashMap<>(0); + Map params = requestParams(); params.put("departmentParentId", departmentParentId); return departmentService.list(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 f08afb49..41ec2ae2 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 @@ -190,16 +190,31 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart } @Override - public List listByAreaCode(String areaCode) { + public List listByParentId(String departmentParentId) { Map params = getHashMap(2); - params.put("departmentAreaCode", areaCode); + params.put("departmentParentId", departmentParentId); return list(params); } @Override - public List listAllByAreaCode(String areaCode) { + public List listByAreaCode(String departmentAreaCode) { Map params = getHashMap(2); - params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); + params.put("departmentAreaCode", departmentAreaCode); + return list(params); + } + + @Override + public List listAllByAreaCode(String departmentAreaCode) { + Map params = getHashMap(2); + params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + return list(params); + } + + @Override + public List listSubAllByAreaCode(String departmentAreaCode) { + Map params = getHashMap(4); + params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + params.put("excludeDepartmentAreaCode", departmentAreaCode); return list(params); } @@ -238,6 +253,13 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart return listPage(page); } + @Override + public SuccessResultList> listPageSubAllByAreaCode(String departmentAreaCode, ListPage page) { + page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); + page.getParams().put("excludeDepartmentAreaCode", departmentAreaCode); + return listPage(page); + } + @Override public DepartmentDTO get(String departmentId) { Map params = getHashMap(1); 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 56538be5..84514860 100644 --- a/service-department/src/main/resources/mybatis/mapper/department-mapper.xml +++ b/service-department/src/main/resources/mybatis/mapper/department-mapper.xml @@ -414,7 +414,11 @@ AND - department_area_code LIKE CONCAT(#{departmentAreaCode}, '%') + department_area_code LIKE CONCAT(#{departmentAreaCodeLike}, '%') + + + AND + department_area_code != #{excludeDepartmentAreaCode} @@ -675,7 +679,11 @@ AND - department_area_code LIKE CONCAT(#{departmentAreaCode}, '%') + department_area_code LIKE CONCAT(#{departmentAreaCodeLike}, '%') + + + AND + department_area_code != #{excludeDepartmentAreaCode} AND