Merge remote-tracking branch 'origin/master'

 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();
    }

}

 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("数据有误，没找到流程的节点");
            }

 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;
            }

 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);