添加仓库配置,处理问题
This commit is contained in:
parent
955c3b46ef
commit
1f7b780a6f
@ -166,6 +166,15 @@ public interface IDepartmentBaseService {
|
|||||||
*/
|
*/
|
||||||
List<ZTreeDTO> listZTree(String departmentParentId, Map<String, Object> params);
|
List<ZTreeDTO> listZTree(String departmentParentId, Map<String, Object> params);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* zTree组织部门
|
||||||
|
*
|
||||||
|
* @param areaCode
|
||||||
|
* @param parentId
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
List<ZTreeDTO> listZTreeByAreaCodeAndParentId(String areaCode, String parentId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 部门ID列表
|
* 部门ID列表
|
||||||
*
|
*
|
||||||
|
@ -25,7 +25,7 @@ public interface IDepartmentUserRemoteService {
|
|||||||
@RemoteGetMethod("/list")
|
@RemoteGetMethod("/list")
|
||||||
List<DepartmentUserDTO> list(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
|
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);
|
List<DepartmentUserDTO> listByDepartmentId(@RemoteServerParams String userCenter, @RemotePathParams("departmentId") String departmentId, @RemoteQueryParams("access_token") String accessToken);
|
||||||
|
|
||||||
@RemotePostMethod("/list/department-ids")
|
@RemotePostMethod("/list/department-ids")
|
||||||
|
@ -151,6 +151,14 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
|
|||||||
return listZTree(params);
|
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
|
@Override
|
||||||
public List<String> listId(Map<String, Object> params) {
|
public List<String> listId(Map<String, Object> params) {
|
||||||
return departmentRemoteService.listId(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
|
return departmentRemoteService.listId(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
|
||||||
|
8
pom.xml
8
pom.xml
@ -528,8 +528,16 @@
|
|||||||
<id>maven-snapshots</id>
|
<id>maven-snapshots</id>
|
||||||
<url>http://121.36.71.250:8888/repository/maven-snapshots/</url>
|
<url>http://121.36.71.250:8888/repository/maven-snapshots/</url>
|
||||||
</snapshotRepository>
|
</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>
|
</distributionManagement>
|
||||||
|
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<finalName>${project.artifactId}</finalName>
|
<finalName>${project.artifactId}</finalName>
|
||||||
<!-- resource start -->
|
<!-- resource start -->
|
||||||
|
@ -327,6 +327,14 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
|
|||||||
return listZTree(params);
|
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
|
@Override
|
||||||
public List<String> listId(Map<String, Object> params) {
|
public List<String> listId(Map<String, Object> params) {
|
||||||
List<String> departmentIds = new ArrayList<>();
|
List<String> departmentIds = new ArrayList<>();
|
||||||
|
@ -289,6 +289,10 @@
|
|||||||
#{departmentIds[${index}]}
|
#{departmentIds[${index}]}
|
||||||
</foreach>
|
</foreach>
|
||||||
</if>
|
</if>
|
||||||
|
<if test="departmentAreaCode != null and departmentAreaCode != ''">
|
||||||
|
AND
|
||||||
|
department_area_code = #{departmentAreaCode}
|
||||||
|
</if>
|
||||||
ORDER BY
|
ORDER BY
|
||||||
department_order
|
department_order
|
||||||
</select>
|
</select>
|
||||||
|
Loading…
Reference in New Issue
Block a user