From 294997a1007d2c92ddc3a86ab16f643bc492f05b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 24 六月 2024 18:08:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java | 2 --
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java | 32 ++++++++++++++++++++++++++++----
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/exception/VciBaseException.java | 2 +-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java | 6 ++++--
4 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/exception/VciBaseException.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/exception/VciBaseException.java
index e556f0d..c74cd78 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/exception/VciBaseException.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/exception/VciBaseException.java
@@ -154,7 +154,7 @@
*/
@Override
public String getMessage(){
- return getCode() +"," + getErrorMsg();
+ return getErrorMsg();
}
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java
index 769146a..fac4192 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java
@@ -204,7 +204,7 @@
public BaseResult getOutcomes(String taskOid){
List<ProcessOutcomeVO> allOutcomes = proDefineService.getOutCome(taskOid, true);
BaseResult result = BaseResult.success();
- result.setObj(allOutcomes);
+ result.setData(allOutcomes);
if(allOutcomes !=null && allOutcomes.size()>0){
result.setSuccess(true);
}else{
@@ -255,7 +255,9 @@
try{
List<ProcessNodeVO> allNode = proDefineService.getAllProcessNode(processOid, true,maxSecret);
if(allNode!=null && allNode.size()>0){
- return BaseResult.success(allNode);
+ BaseResult baseResult = BaseResult.success();
+ baseResult.setData(allNode);
+ return baseResult;
}else{
return BaseResult.fail("鏁版嵁鏈夎锛屾病鎵惧埌娴佺▼鐨勮妭鐐�");
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
index adbbf81..6d760d5 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
@@ -5,13 +5,12 @@
import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder;
import com.thoughtworks.xstream.io.xml.XppDriver;
import com.vci.corba.common.PLException;
+import com.vci.corba.framework.data.RoleRightInfo;
import com.vci.corba.portal.data.*;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.util.BeanUtil;
-import com.vci.starter.web.util.LangBaseUtil;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.util.VciDateUtil;
+import com.vci.starter.web.pagemodel.SessionInfo;
+import com.vci.starter.web.util.*;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.enumpck.UIComponentDisplayTypeEnum;
import com.vci.web.enumpck.UIComponentTypeEnum;
@@ -1382,6 +1381,31 @@
public List<UIButtonDefineVO> listButtonByComponent(String pkComponent){
try {
List<UIButtonDefineVO> buttonDefineVOS = buttonDO2VOs(Arrays.stream(platformClientUtil.getUIService().getPLTabButtonsByTableOId(pkComponent)).collect(Collectors.toSet())).stream().sorted(((o1, o2) -> o1.getOrderNum().compareTo(o2.getOrderNum()))).collect(Collectors.toList());
+
+ Map<String,RoleRightInfo> allRightRoleMap = new HashMap<>();
+ RoleRightInfo[] bts = platformClientUtil.getFrameworkService().getRoleRightByUserName("bt");
+ Map<String,Long> rightMap = new HashMap<String,Long>();
+ for(RoleRightInfo obj:bts){
+ allRightRoleMap.put(obj.funcId, obj);
+ rightMap.put(obj.funcId,obj.rightValue);
+ }
+ //寰幆瀵规寜閽潈闄愯繘琛屽垽鏂紝娌℃湁鏉冮檺鐨勫皢绉婚櫎buttonDefineVOS瀵硅薄
+ Iterator<UIButtonDefineVO> buttonDefineVO = buttonDefineVOS.iterator();
+ while (buttonDefineVO.hasNext()){
+ UIButtonDefineVO buttonDefine = buttonDefineVO.next();
+ if(rightMap.containsKey(buttonDefine.getPkComponent())) {
+ Long rightValue = rightMap.get(buttonDefine.getPkComponent());
+ int nodeValue = buttonDefine.getOrderNum();
+ if (nodeValue >= 0 && nodeValue <= 63) {
+ //杩涜浣嶄笌鎿嶄綔锛屽鏋滅浉绛夊垯琛ㄧず鍏锋湁褰撳墠鎿嶄綔鐨勬潈闄�
+ long preValue = (rightValue >> nodeValue) & 1;
+ if (preValue != 1) {
+ buttonDefineVO.remove();
+ }
+ }
+ }
+ }
+
if(CollectionUtils.isEmpty(buttonDefineVOS)){
return buttonDefineVOS;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
index 78d98be..09addb7 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
@@ -146,8 +146,6 @@
*/
@Override
public BaseResult uploadFile(MultipartFile multipartFile, VciFileObjectDTO fileObjectDTO) throws VciBaseException {
- VciBaseUtil.alertNotNull(fileObjectDTO.getFileDocClassify(), "鏂囨。绫诲瀷缂栧彿");
-
String sourceFileName = multipartFile.getOriginalFilename();
String fileExtension = getFileExtension(sourceFileName);
String fileNameNoExtension = getFileNameNoExtension(sourceFileName);
--
Gitblit v1.9.3