From cc6354cee46ff8facbd16c8919f2616c9031acdb Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期五, 21 六月 2024 10:19:59 +0800
Subject: [PATCH] 1、三元账号验证修改，以及获取数据修改
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java | 2 +-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java | 2 +-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/RightControlUtil.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
index f5d358d..93c7710 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
@@ -1133,7 +1133,7 @@
Map<String,String> baseDataMap = formDataDTO2MapLow(formDataDTO);
Map<String,String> allDataMapLow = new HashMap<>();
allDataMapLow.putAll(dataLow);
-// allDataMapLow.putAll(baseDataMap);
+ allDataMapLow.putAll(baseDataMap);
//鍒ゆ柇蹇呰緭椤�
BaseResult result = checkRequired(formDefineVO,null,allDataMapLow);
if(!result.isSuccess()){
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
index 611d40d..f53eb5b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
@@ -613,7 +613,7 @@
// BusinessObject cbo = new BusinessObject();
// cbo = bo;
queryEnumText(bo,enumAttrName);
-// allCbos.add(cbo);
+ allCbos.add(bo);
}
//鍥犱负淇敼浜嗘煡璇㈢殑鏂瑰紡锛屾墍浠ュ氨涓嶉渶瑕佸崟鐙煡璇㈠弬鐓�
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/RightControlUtil.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/RightControlUtil.java
index 7403ec3..e011cd6 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/RightControlUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/RightControlUtil.java
@@ -118,7 +118,7 @@
public boolean isThreeAdminCurUser() {
SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfoNotException();
try {
- RoleInfo[] roles = platformClientUtil.getFrameworkService().fetchRoleInfoByUserId(sessionInfo.getUserId());
+ RoleInfo[] roles = platformClientUtil.getFrameworkService().fetchRoleInfoByUserId(sessionInfo.getUserOid());
for (RoleInfo role : roles) {
if (role.name.equalsIgnoreCase("绯荤粺绠＄悊鍛�")){
return true;
--
Gitblit v1.9.3