zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

♻️ Refactoring code. 重构部门结构

Browse Source
This commit is contained in:
lbw committed 2023-04-04 11:12:47 +08:00
1 parent 2f85b35bd5
commit c0f7da40f7
3 files changed
+5 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-common/pigx-common-bom/pom.xml
+1 -1
View File
@@ -21,7 +21,7 @@
<mybatis-plus.version>3.5.3.1</mybatis-plus.version>
<dynamic-ds.version>3.5.2</dynamic-ds.version>
<druid.version>1.2.9</druid.version>
<hutool.version>5.8.15</hutool.version>
<hutool.version>5.8.16</hutool.version>
<mysql.connector.version>8.0.30</mysql.connector.version>
<oracle.version>21.3.0.0</oracle.version>
<sqlserver.version>8.4.1.jre8</sqlserver.version>
pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDatascopeHandle.java
+2 -1
View File
@@ -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);
}
pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDataScopeService.java
+2 -2
View File
@@ -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<List<SysDeptRelation>> getDescendantList(@PathVariable("deptId") Long deptId);
R<List<SysDept>> getDescendantList(@PathVariable("deptId") Long deptId);
}