Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理组织部门资源接口问题

Browse Source
This commit is contained in:
wanggeng 2021-11-08 15:58:27 +08:00
parent 8fab7a8981
commit 783514a285
5 changed files with 89 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
basic-interface/src/main/java/ink/wgink/interfaces/department/IDepartmentBaseService.java
View File

@ -49,19 +49,46 @@ public interface IDepartmentBaseService {
/**
* 部门列表
*
* @param departmentAreaCode
* @param departmentAreaCode 地区编码
* @param order 排序方式
* @return
*/
List<DepartmentDTO> listByAreaCodeAndOrder(String departmentAreaCode, String order);
/**
* 部门列表
*
* @param departmentAreaCode 地区编码
* @return
*/
List<DepartmentDTO> listAllByAreaCode(String departmentAreaCode);
/**
* 部门列表
*
* @param departmentAreaCode 地区编码
* @param order 排序方式
* @return
*/
List<DepartmentDTO> listAllByAreaCodeAndOrder(String departmentAreaCode, String order);
/**
* 部门全部子列表
*
* @param departmentAreaCode
* @param departmentAreaCode 地区编码
* @return
*/
List<DepartmentDTO> listSubAllByAreaCode(String departmentAreaCode);
/**
* 部门全部子列表
*
* @param departmentAreaCode 地区编码
* @param order 排序方式
* @return
*/
List<DepartmentDTO> listSubAllByAreaCodeAndOrder(String departmentAreaCode, String order);
/**
* 通过ID获取组织部门详情
*

28
login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentServiceImpl.java
View File

@ -57,6 +57,15 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
return list(params);
}
@Override
public List<DepartmentDTO> listByAreaCodeAndOrder(String departmentAreaCode, String order) {
Map<String, Object> params = getHashMap(6);
params.put("departmentAreaCode", departmentAreaCode);
params.put("sort", "departmentAreaCode");
params.put("order", order);
return list(params);
}
@Override
public List<DepartmentDTO> listAllByAreaCode(String departmentAreaCode) {
Map<String, Object> params = getHashMap(2);
@ -64,6 +73,15 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
return list(params);
}
@Override
public List<DepartmentDTO> listAllByAreaCodeAndOrder(String departmentAreaCode, String order) {
Map<String, Object> params = getHashMap(6);
params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0'));
params.put("sort", "departmentAreaCode");
params.put("order", order);
return list(params);
}
@Override
public List<DepartmentDTO> listSubAllByAreaCode(String departmentAreaCode) {
Map<String, Object> params = getHashMap(4);
@ -72,6 +90,16 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
return list(params);
}
@Override
public List<DepartmentDTO> listSubAllByAreaCodeAndOrder(String departmentAreaCode, String order) {
Map<String, Object> params = getHashMap(8);
params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0'));
params.put("excludeDepartmentAreaCode", departmentAreaCode);
params.put("sort", "departmentAreaCode");
params.put("order", order);
return list(params);
}
@Override
public DepartmentDTO get(String departmentId) {
return departmentRemoteService.get(apiPathProperties.getUserCenter(), departmentId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());

5
service-department/src/main/java/ink/wgink/service/department/controller/resources/DepartmentResourceController.java
View File

@ -106,11 +106,6 @@ public class DepartmentResourceController extends DefaultBaseController {
@GetMapping("listpage")
public SuccessResultList<List<DepartmentDTO>> listPage(ListPage page) {
Map<String, Object> params = requestParams();
String departmentParentId = "0";
if (!StringUtils.isBlank(params.get("parentId") == null ? null : params.get("parentId").toString())) {
departmentParentId = params.get("parentId").toString();
}
params.put("departmentParentId", departmentParentId);
page.setParams(params);
return departmentService.listPage(page);
}

28
service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java
View File

@ -203,6 +203,15 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
return list(params);
}
@Override
public List<DepartmentDTO> listByAreaCodeAndOrder(String departmentAreaCode, String order) {
Map<String, Object> params = getHashMap(6);
params.put("departmentAreaCode", departmentAreaCode);
params.put("sort", "departmentAreaCode");
params.put("order", order);
return list(params);
}
@Override
public List<DepartmentDTO> listAllByAreaCode(String departmentAreaCode) {
Map<String, Object> params = getHashMap(2);
@ -210,6 +219,15 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
return list(params);
}
@Override
public List<DepartmentDTO> listAllByAreaCodeAndOrder(String departmentAreaCode, String order) {
Map<String, Object> params = getHashMap(6);
params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0'));
params.put("sort", "departmentAreaCode");
params.put("order", order);
return list(params);
}
@Override
public List<DepartmentDTO> listSubAllByAreaCode(String departmentAreaCode) {
Map<String, Object> params = getHashMap(4);
@ -218,6 +236,16 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
return list(params);
}
@Override
public List<DepartmentDTO> listSubAllByAreaCodeAndOrder(String departmentAreaCode, String order) {
Map<String, Object> params = getHashMap(8);
params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0'));
params.put("excludeDepartmentAreaCode", departmentAreaCode);
params.put("sort", "departmentAreaCode");
params.put("order", order);
return list(params);
}
@Override
public SuccessResultList<List<DepartmentDTO>> listPage(ListPage page) {
PageHelper.startPage(page.getPage(), page.getRows());

5
service-department/src/main/resources/mybatis/mapper/department-mapper.xml
View File

@ -421,7 +421,7 @@
department_area_code != #{excludeDepartmentAreaCode}
</if>
<choose>
<when test="sort != null and (sort == 'departmentName' or sort == 'departmentNameEn' or sort == 'departmentNameOther' or sort == 'departmentCode' or sort == 'departmentType' or sort == 'departmentState')">
<when test="sort != null and (sort == 'departmentName' or sort == 'departmentNameEn' or sort == 'departmentNameOther' or sort == 'departmentCode' or sort == 'departmentType' or sort == 'departmentState' or sort == 'departmentAreaCode')">
ORDER BY
<if test="sort == 'departmentName'">
department_name ${order}
@ -441,6 +441,9 @@
<if test="sort == 'departmentState'">
department_state ${order}
</if>
<if test="sort == 'departmentAreaCode'">
department_area_code ${order}
</if>
</when>
<otherwise>
ORDER BY