瀏覽代碼

fix: 修复问题

黄资权 1 年之前
父節點
當前提交
0eaefaea49

+ 7 - 1
approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/impl/DcucBusinessImpl.java

@@ -239,7 +239,13 @@ public class DcucBusinessImpl implements IDcucBusiness {
 
     @Override
     public List<String> getUserByLabelCodeUserList(String orgCode, String labelCode) {
-        List<UserLabel2RespVO> userByLabelCodeList = getUserByLabelCode(orgCode, labelCode);
+        List<UserLabel2RespVO> userByLabelCodeList = Collections.emptyList();
+        try {
+            userByLabelCodeList = getUserByLabelCode(orgCode, labelCode);
+        } catch (RuntimeException e) {
+            logger.error("查询审批人标签代码异常", e);
+        }
+
         return Optional.ofNullable(userByLabelCodeList)
                 .orElse(Collections.emptyList())
                 .stream().map(UserLabel2RespVO::getIdcard)

+ 0 - 8
approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/impl/DcucWorkFlowCallbackBusinessImpl.java

@@ -3,7 +3,6 @@ package com.dragonsoft.dcuc.approve.business.external.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
 import com.dragonsoft.dcuc.approve.business.approver.IGetApproverBusiness;
-import com.dragonsoft.dcuc.approve.business.external.IDcucBusiness;
 import com.dragonsoft.dcuc.approve.business.external.IWorkFlowCallbackBusiness;
 import com.dragonsoft.dcuc.approve.enumresources.ApproveGetApproverEnum;
 import com.dragonsoft.dcuc.approve.properties.ApproveWorkFlowCallbackProperties;
@@ -31,13 +30,6 @@ public class DcucWorkFlowCallbackBusinessImpl implements IWorkFlowCallbackBusine
 
     private ApproveWorkFlowCallbackProperties approveWorkFlowCallbackProperties;
 
-    private IDcucBusiness dcucBusiness;
-
-    @Autowired
-    public void setDcucBusiness(IDcucBusiness dcucBusiness) {
-        this.dcucBusiness = dcucBusiness;
-    }
-
     @Autowired
     public void setApproveWorkFlowCallbackProperties(ApproveWorkFlowCallbackProperties approveWorkFlowCallbackProperties) {
         this.approveWorkFlowCallbackProperties = approveWorkFlowCallbackProperties;

+ 1 - 1
approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/impl/SecurityUserBusinessImpl.java

@@ -94,7 +94,7 @@ public class SecurityUserBusinessImpl implements ISecurityUserBusiness {
         }
 
         if (ObjectUtil.isNull(securityUser)) {
-            String format = String.format("无法获取到用户:%s", appCode);
+            String format = String.format("无法获取到用户:%s", idcard);
             log.error(format);
             return ResponseUtil.dtoFail("用户凭据信息无效");
         }

+ 7 - 3
approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/dto/ProcessInstanceInfoDTO.java

@@ -1,5 +1,6 @@
 package com.dragonsoft.dcuc.approve.model.dto;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.dragonsoft.duceap.duwf.api.model.ProcessInstanceVO;
 import com.dragonsoft.duceap.duwf.api.model.TaskHistoryDetailVo;
 import lombok.Data;
@@ -53,9 +54,12 @@ public class ProcessInstanceInfoDTO {
         String processInstanceId = "";
         if (processInstanceVO != null) {
             TaskHistoryDetailVo taskHistoryDetailVo = processInstanceVO.getTaskHistoryDetailVo();
-            flowNodeCode = taskHistoryDetailVo.getTaskCode();
-            flowNodeName = taskHistoryDetailVo.getName();
-            taskKey = taskHistoryDetailVo.getTaskDefinitionKey();
+            if (ObjectUtil.isNotNull(taskHistoryDetailVo)) {
+                flowNodeCode = taskHistoryDetailVo.getTaskCode();
+                flowNodeName = taskHistoryDetailVo.getName();
+                taskKey = taskHistoryDetailVo.getTaskDefinitionKey();
+            }
+
             flowKey = processInstanceVO.getPocessDefinitionId();
             processInstanceId = processInstanceVO.getProcessInstanceId();
         }