From 51542c2d2272cfe19db8e7dbc07cccc1c448d22a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 20 九月 2024 15:17:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
index a420aad..1fcb587 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
@@ -12,6 +12,7 @@
import com.vci.corba.framework.data.*;
import com.vci.corba.omd.data.BusinessObject;
import com.vci.corba.portal.data.PLUILayout;
+import com.vci.dto.RoleInfoDTO;
import com.vci.dto.RoleRightDTO;
import com.vci.dto.RoleRightParamDTO;
import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
@@ -531,6 +532,7 @@
menuVO.setSort((int) funcObj.seq);
findChildAuthFunctionVO(menuVO, isAll);
functionVO.getChildren().add(menuVO);
+ functionVO.setHasChildren(true);
}
}else if(type == 2){
FuncOperationInfo[] infos = platformClientUtil.getFrameworkService().getFuncOperationByModule(functionVO.getId(), "", true);
@@ -549,6 +551,7 @@
menuVO.setIsValid(info.isValid);
menuVO.setHasChildren(false);
functionVO.getChildren().add(menuVO);
+ functionVO.setHasChildren(true);
}
}else{
functionVO.setHasChildren(false);
@@ -580,15 +583,13 @@
public List<String> getSysModelAuth(String roleId) throws PLException {
RoleRightInfo[] roleRightList = platformClientUtil.getFrameworkService().getRoleRightList(roleId, WebUtil.getCurrentUserId());
- Map<String, Long> authMap = Arrays.stream(roleRightList).collect(Collectors.toMap(e -> e.funcId, e -> e.rightValue));
+ Map<String, Long> authMap = Arrays.stream(roleRightList).collect(Collectors.toMap(e -> e.funcId, e -> e.rightValue,
+ (existing, replacement) -> existing));
String parentId;
SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfoNotException();
boolean adminOrDeveloperOrRoot = rightControlUtil.isAdminOrDeveloperOrRoot(sessionInfo.getUserId());
if (adminOrDeveloperOrRoot) {
//绯荤粺鑿滃崟
- parentId = SYSTEMMANAGMENTNODE;
- } else if (rightControlUtil.isThreeAdminCurUser()) {
- //涓夊憳杩斿洖绠＄悊鍔熻兘妯″潡鐩稿叧鐨勮彍鍗�
parentId = SYSTEMMANAGMENTNODE;
} else {
//鏅�氱敤鎴峰彧杩斿洖涓氬姟鍔熻兘妯″潡鐩稿叧鐨勮彍鍗�
@@ -683,6 +684,32 @@
throw new PLException("500", new String[]{"鍔熻兘妯″潡鎺堟潈澶辫触锛�"});
}
return BaseResult.success();
+ }
+ /**
+ * 鑾峰彇鎵�鎺堟潈鐨勬ā鍧楁潈闄�
+ * @param roleName 鎼滅储鐨勮鑹�
+ * @return 瑙掕壊鍒楄〃
+ */
+ @Override
+ public List<RoleInfoDTO> getRoleList(String roleName) throws PLException {
+ RoleInfo[] roleInfos = platformClientUtil.getFrameworkService().fetchRoleInfoByUserType(WebUtil.getCurrentUserId());
+ List<RoleInfoDTO> dtos = new ArrayList<>();
+ for (RoleInfo roleInfo : roleInfos) {
+ if(StringUtils.isBlank(roleName) || roleInfo.name.indexOf(roleName) != -1) {
+ RoleInfoDTO dto = new RoleInfoDTO();
+ dto.setName(roleInfo.name);
+ dto.setDescription(roleInfo.description);
+ dto.setId(roleInfo.id);
+ dto.setGrantor(roleInfo.grantor);
+ dto.setType(roleInfo.type);
+ dto.setCreateTime(roleInfo.createTime);
+ dto.setCreateUser(roleInfo.createUser);
+ dto.setUpdateTime(roleInfo.updateTime);
+ dto.setUpdateUser(roleInfo.updateUser);
+ dtos.add(dto);
+ }
+ }
+ return dtos;
}
private long countRightValue(List<RoleRightParamDTO> dtos){
@@ -1075,9 +1102,6 @@
String parentId;
if (adminOrDeveloperOrRoot) {
//绯荤粺鑿滃崟
- parentId = SYSTEMMANAGMENTNODE;
- } else if (rightControlUtil.isThreeAdminCurUser()) {
- //涓夊憳杩斿洖绠＄悊鍔熻兘妯″潡鐩稿叧鐨勮彍鍗�
parentId = SYSTEMMANAGMENTNODE;
} else {
//鏅�氱敤鎴峰彧杩斿洖涓氬姟鍔熻兘妯″潡鐩稿叧鐨勮彍鍗�
--
Gitblit v1.9.3