diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index f2e2aa1c8..67a9572f5 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -21,7 +21,7 @@ 3.5.3.1 3.5.2 1.2.9 - 5.8.15 + 5.8.16 8.0.30 21.3.0.0 8.4.1.jre8 diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDatascopeHandle.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDatascopeHandle.java index f48e9fd48..e606d3163 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDatascopeHandle.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDatascopeHandle.java @@ -19,6 +19,7 @@ package com.pig4cloud.pigx.common.data.datascope; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; +import com.pig4cloud.pigx.admin.api.entity.SysDept; import com.pig4cloud.pigx.admin.api.entity.SysDeptRelation; import com.pig4cloud.pigx.admin.api.entity.SysRole; import com.pig4cloud.pigx.admin.api.feign.RemoteDataScopeService; @@ -99,7 +100,7 @@ public class PigxDefaultDatascopeHandle implements DataScopeHandle { .getData() .orElseGet(Collections::emptyList) .stream() - .map(SysDeptRelation::getDescendant).collect(Collectors.toList()); + .map(SysDept::getDeptId).collect(Collectors.toList()); // @formatter:on deptList.addAll(deptIdList); } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDataScopeService.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDataScopeService.java index 1a6d5ea1a..a0ea18338 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDataScopeService.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDataScopeService.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.admin.api.feign; -import com.pig4cloud.pigx.admin.api.entity.SysDeptRelation; +import com.pig4cloud.pigx.admin.api.entity.SysDept; import com.pig4cloud.pigx.admin.api.entity.SysRole; import com.pig4cloud.pigx.common.core.constant.ServiceNameConstants; import com.pig4cloud.pigx.common.core.util.R; @@ -52,6 +52,6 @@ public interface RemoteDataScopeService { * @return */ @GetMapping("/dept/getDescendantList/{deptId}") - R> getDescendantList(@PathVariable("deptId") Long deptId); + R> getDescendantList(@PathVariable("deptId") Long deptId); }