From a8156ac3d36b99067b48c32738658249c0f822f2 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Sat, 6 Nov 2021 16:36:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E9=97=A8=E6=8C=89?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../department/IDepartmentBaseService.java | 34 +++++++++++++++++++ .../impl/DepartmentServiceImpl.java | 26 ++++++++++++++ .../service/impl/DepartmentServiceImpl.java | 31 ++++++++++++++--- .../mybatis/mapper/department-mapper.xml | 12 +++++++ .../resources/templates/department/save.html | 2 +- .../templates/department/update.html | 2 +- 6 files changed, 101 insertions(+), 6 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 818e09f2..8c1c80e0 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 @@ -30,6 +30,22 @@ public interface IDepartmentBaseService { */ List list(Map params); + /** + * 部门列表 + * + * @param areaCode + * @return + */ + List listByAreaCode(String areaCode); + + /** + * 部门列表 + * + * @param areaCode + * @return + */ + List listAllByAreaCode(String areaCode); + /** * 通过ID获取组织部门详情 * @@ -55,6 +71,24 @@ public interface IDepartmentBaseService { */ SuccessResultList> listPageByParentId(String departmentParentId, ListPage page); + /** + * 组织部门列表 + * + * @param departmentParentId + * @param page + * @return + */ + SuccessResultList> listPageByAreaCode(String areaCode, ListPage page); + + /** + * 组织部门列表 + * + * @param departmentParentId + * @param page + * @return + */ + SuccessResultList> listPageAllByAreaCode(String areaCode, 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 a0b79002..3b50ebbf 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 @@ -43,6 +43,20 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart return departmentRemoteService.list(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params); } + @Override + public List listByAreaCode(String areaCode) { + Map params = getHashMap(2); + params.put("departmentAreaCode", areaCode); + return list(params); + } + + @Override + public List listAllByAreaCode(String areaCode) { + Map params = getHashMap(2); + params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); + return list(params); + } + @Override public DepartmentDTO get(String departmentId) { return departmentRemoteService.get(apiPathProperties.getUserCenter(), departmentId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken()); @@ -59,6 +73,18 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart return listPage(page); } + @Override + public SuccessResultList> listPageByAreaCode(String areaCode, ListPage page) { + page.getParams().put("departmentAreaCode", areaCode); + return listPage(page); + } + + @Override + public SuccessResultList> listPageAllByAreaCode(String areaCode, ListPage page) { + page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); + 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 e31fce5f..f08afb49 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 @@ -9,7 +9,6 @@ import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.module.dictionary.service.IAreaService; import ink.wgink.module.file.excel.error.AbstractErrorExcelHandler; import ink.wgink.module.file.service.IFileService; import ink.wgink.pojo.ListPage; @@ -60,8 +59,6 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart private IDepartmentAdjustmentService departmentAdjustmentService; @Autowired private IFileService fileService; - @Autowired - private IAreaService areaService; @Override public void save(DepartmentVO departmentVO) { @@ -192,6 +189,20 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart return destDepartmentDTOs; } + @Override + public List listByAreaCode(String areaCode) { + Map params = getHashMap(2); + params.put("departmentAreaCode", areaCode); + return list(params); + } + + @Override + public List listAllByAreaCode(String areaCode) { + Map params = getHashMap(2); + params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); + return list(params); + } + @Override public SuccessResultList> listPage(ListPage page) { PageHelper.startPage(page.getPage(), page.getRows()); @@ -215,6 +226,18 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart return listPage(page); } + @Override + public SuccessResultList> listPageByAreaCode(String areaCode, ListPage page) { + page.getParams().put("departmentAreaCode", areaCode); + return listPage(page); + } + + @Override + public SuccessResultList> listPageAllByAreaCode(String areaCode, ListPage page) { + page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); + return listPage(page); + } + @Override public DepartmentDTO get(String departmentId) { Map params = getHashMap(1); @@ -243,7 +266,7 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart @Override public List listZTree(String departmentParentId, Map params) { - if (StringUtils.equals(ISystemConstant.TREE_ROOT_ID, departmentParentId)) { + if (securityComponent.getCurrentUser() != null && StringUtils.equals(ISystemConstant.TREE_ROOT_ID, departmentParentId)) { List listBaseDepartmentIds = listBaseDepartmentIds(); if (listBaseDepartmentIds != null && !listBaseDepartmentIds.isEmpty()) { params.put("departmentIds", listBaseDepartmentIds); 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 0f261411..56538be5 100644 --- a/service-department/src/main/resources/mybatis/mapper/department-mapper.xml +++ b/service-department/src/main/resources/mybatis/mapper/department-mapper.xml @@ -408,6 +408,14 @@ AND gmt_create #{endTime} + + AND + department_area_code = #{departmentAreaCode} + + + AND + department_area_code LIKE CONCAT(#{departmentAreaCode}, '%') + ORDER BY @@ -665,6 +673,10 @@ AND department_area_code = #{departmentAreaCode} + + AND + department_area_code LIKE CONCAT(#{departmentAreaCode}, '%') + AND department_type = #{departmentType} diff --git a/service-department/src/main/resources/templates/department/save.html b/service-department/src/main/resources/templates/department/save.html index 9636f1c7..9d5e0742 100644 --- a/service-department/src/main/resources/templates/department/save.html +++ b/service-department/src/main/resources/templates/department/save.html @@ -315,7 +315,7 @@ areaName += item.areaName; } } - $('#departmentAreaCode').val(departmentAreaCode); + $('#departmentAreaCode').val(areaCode); $('#departmentAreaName').val(areaName); } }) diff --git a/service-department/src/main/resources/templates/department/update.html b/service-department/src/main/resources/templates/department/update.html index a038ee57..903e6dd9 100644 --- a/service-department/src/main/resources/templates/department/update.html +++ b/service-department/src/main/resources/templates/department/update.html @@ -290,7 +290,7 @@ areaName += item.areaName; } } - $('#departmentAreaCode').val(departmentAreaCode); + $('#departmentAreaCode').val(areaCode); $('#departmentAreaName').val(areaName); } })