添加仓库配置,处理问题

This commit is contained in:
wanggeng 2021-11-11 16:46:27 +08:00
parent 955c3b46ef
commit 1f7b780a6f
6 changed files with 38 additions and 1 deletions

View File

@ -166,6 +166,15 @@ public interface IDepartmentBaseService {
*/
List<ZTreeDTO> listZTree(String departmentParentId, Map<String, Object> params);
/**
* zTree组织部门
*
* @param areaCode
* @param parentId
* @return
*/
List<ZTreeDTO> listZTreeByAreaCodeAndParentId(String areaCode, String parentId);
/**
* 部门ID列表
*

View File

@ -25,7 +25,7 @@ public interface IDepartmentUserRemoteService {
@RemoteGetMethod("/list")
List<DepartmentUserDTO> list(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
@RemoteGetMethod("/list/{department}")
@RemoteGetMethod("/list/{departmentId}")
List<DepartmentUserDTO> listByDepartmentId(@RemoteServerParams String userCenter, @RemotePathParams("departmentId") String departmentId, @RemoteQueryParams("access_token") String accessToken);
@RemotePostMethod("/list/department-ids")

View File

@ -151,6 +151,14 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
return listZTree(params);
}
@Override
public List<ZTreeDTO> listZTreeByAreaCodeAndParentId(String departmentAreaCode, String departmentParentId) {
Map<String, Object> params = getHashMap(4);
params.put("departmentAreaCode", departmentAreaCode);
params.put("id", departmentParentId);
return listZTree(params);
}
@Override
public List<String> listId(Map<String, Object> params) {
return departmentRemoteService.listId(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);

View File

@ -528,8 +528,16 @@
<id>maven-snapshots</id>
<url>http://121.36.71.250:8888/repository/maven-snapshots/</url>
</snapshotRepository>
<!--
<repository>
<id>sucstep-wg-basic-wg-basic</id>
<name>wg-basic</name>
<url>https://sucstep-maven.pkg.coding.net/repository/wg-basic/wg-basic/</url>
</repository>
-->
</distributionManagement>
<build>
<finalName>${project.artifactId}</finalName>
<!-- resource start -->

View File

@ -327,6 +327,14 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
return listZTree(params);
}
@Override
public List<ZTreeDTO> listZTreeByAreaCodeAndParentId(String departmentAreaCode, String departmentParentId) {
Map<String, Object> params = getHashMap(4);
params.put("departmentAreaCode", departmentAreaCode);
params.put("departmentParentId", departmentParentId);
return listZTree(params);
}
@Override
public List<String> listId(Map<String, Object> params) {
List<String> departmentIds = new ArrayList<>();

View File

@ -289,6 +289,10 @@
#{departmentIds[${index}]}
</foreach>
</if>
<if test="departmentAreaCode != null and departmentAreaCode != ''">
AND
department_area_code = #{departmentAreaCode}
</if>
ORDER BY
department_order
</select>