gitee/snowy
1
0
Fork 0
mirror of https://gitee.com/xiaonuobase/snowy.git synced 2026-03-22 10:47:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

【底座】SysRelationApi.java和SysUserApi.java与其他版本保持一致

Browse Source
This commit is contained in:
xuyuxiang
2026-03-08 21:22:26 +08:00
parent 33575c44a5
commit 9974df2218
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/relation/provider/SysRelationApiProvider.java
View File

@@ -49,7 +49,7 @@ public class SysRelationApiProvider implements SysRelationApi {
private SysUserService sysUserService;
@Override
public List<String> getUserIdListByRoleIdList(List<String> roleIdList) {
public List<String> getUserIdListByRoleIdList(String initiator, List<String> roleIdList) {
List<String> userIdList = sysRelationService.getRelationObjectIdListByTargetIdListAndCategory(roleIdList,
SysRelationCategoryEnum.SYS_USER_HAS_ROLE.getValue());
if(ObjectUtil.isNotEmpty(userIdList)){
@@ -62,7 +62,7 @@ public class SysRelationApiProvider implements SysRelationApi {
}
@Override
public List<String> getUserIdListByGroupIdList(List<String> groupIdList) {
public List<String> getUserIdListByGroupIdList(String initiator, List<String> groupIdList) {
List<String> userIdList = sysRelationService.getRelationObjectIdListByTargetIdListAndCategory(groupIdList,
SysRelationCategoryEnum.SYS_USER_HAS_GROUP.getValue());
if(ObjectUtil.isNotEmpty(userIdList)){

26
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/provider/SysUserApiProvider.java
View File

@@ -93,7 +93,7 @@ public class SysUserApiProvider implements SysUserApi {
}
@Override
public List<String> getUserIdListByOrgIdList(List<String> orgIdList) {
public List<String> getUserIdListByOrgIdList(String initiator, List<String> orgIdList) {
if(ObjectUtil.isNotEmpty(orgIdList)) {
String orConditionSql = orgIdList.stream().map(orgId -> "POSITION_JSON LIKE '%" + orgId + "%'")
.collect(Collectors.joining(" OR "));
@@ -105,7 +105,7 @@ public class SysUserApiProvider implements SysUserApi {
}
@Override
public List<String> getUserIdListByPositionIdList(List<String> positionIdList) {
public List<String> getUserIdListByPositionIdList(String initiator, List<String> positionIdList) {
if(ObjectUtil.isNotEmpty(positionIdList)) {
String orConditionSql = positionIdList.stream().map(positionId -> "POSITION_JSON LIKE '%" + positionId + "%'")
.collect(Collectors.joining(" OR "));
@@ -116,8 +116,8 @@ public class SysUserApiProvider implements SysUserApi {
}
@Override
public JSONObject getSupervisorIdBySupervisorLevel(List<String> userIdList, String userId, String orgId, String supervisorLevel) {
SysUser sysUser = sysUserService.queryEntity(userId);
public JSONObject getSupervisorIdBySupervisorLevel(String initiator, List<String> userIdList, String orgId, String supervisorLevel) {
SysUser sysUser = sysUserService.queryEntity(initiator);
String userOrgId = sysUser.getOrgId();
String positionJson = sysUser.getPositionJson();
AtomicReference<String> result = new AtomicReference<>();
@@ -153,21 +153,21 @@ public class SysUserApiProvider implements SysUserApi {
if(ObjectUtil.isEmpty(resultUserId)) {
// 查不到，则当前用户就是最高层级主管
if(ObjectUtil.isEmpty(userIdList)) {
return JSONUtil.createObj().set("id", userId).set("idList", CollectionUtil.newArrayList(userId));
return JSONUtil.createObj().set("id", initiator).set("idList", CollectionUtil.newArrayList(initiator));
} else {
return JSONUtil.createObj().set("id", userId).set("idList", userIdList);
return JSONUtil.createObj().set("id", initiator).set("idList", userIdList);
}
} else {
if(ObjectUtil.isNotEmpty(userIdList)) {
if(userIdList.contains(resultUserId)) {
// 如果查出的结果已经出现过，意味着出现了循环主管，则当前的userId就是最高级主管
return JSONUtil.createObj().set("id", userId).set("idList", userIdList);
return JSONUtil.createObj().set("id", initiator).set("idList", userIdList);
}
}
// 如果结果为空，则将查询的结果放入集合
userIdList.add(resultUserId);
// 继续查询
return this.getSupervisorIdBySupervisorLevel(userIdList, resultUserId, orgId, supervisorLevel);
return this.getSupervisorIdBySupervisorLevel(resultUserId, userIdList, orgId, supervisorLevel);
}
} else {
// 如果要求查指定层级主管
@@ -185,23 +185,23 @@ public class SysUserApiProvider implements SysUserApi {
if(ObjectUtil.isNotEmpty(userIdList)) {
if(userIdList.contains(resultUserId)) {
// 如果查出的结果已经出现过，意味着出现了循环主管，则当前的userId就暂定是满足层级的主管
return JSONUtil.createObj().set("id", userId).set("idList", userIdList);
return JSONUtil.createObj().set("id", initiator).set("idList", userIdList);
}
}
// 如果查出的结果没有出现过，则将查询的结果放入集合
userIdList.add(resultUserId);
// 继续查更高层级主管
return this.getSupervisorIdBySupervisorLevel(userIdList, resultUserId, orgId, nextLevel);
return this.getSupervisorIdBySupervisorLevel(resultUserId, userIdList, orgId, nextLevel);
}
}
}
}
@Override
public List<String> getMulSupervisorIdListByEndLevel(String userId, String orgId, String endLevel) {
public List<String> getMulSupervisorIdListByEndLevel(String initiator, String orgId, String endLevel) {
List<String> resultList = CollectionUtil.newArrayList();
if(endLevel.equals("-1")) {
List<String> idList = this.getSupervisorIdBySupervisorLevel(CollectionUtil.newArrayList(), userId, orgId, endLevel)
List<String> idList = this.getSupervisorIdBySupervisorLevel(initiator, CollectionUtil.newArrayList(), orgId, endLevel)
.getBeanList("idList", String.class);
if(ObjectUtil.isNotEmpty(idList)) {
resultList.addAll(idList);
@@ -209,7 +209,7 @@ public class SysUserApiProvider implements SysUserApi {
} else {
Integer levelValue = Convert.toInt(endLevel);
for (int i = 1; i < levelValue; i++) {
String supervisorId = this.getSupervisorIdBySupervisorLevel(CollectionUtil.newArrayList(), userId, orgId,
String supervisorId = this.getSupervisorIdBySupervisorLevel(initiator, CollectionUtil.newArrayList(), orgId,
Convert.toStr(i)).getStr("id");
if(ObjectUtil.isNotEmpty(supervisorId)) {
resultList.add(supervisorId);