yzc před 1 rokem
rodič
revize
fb11391b5a

+ 3 - 1
hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowExampleServiceImpl.java

@@ -491,7 +491,9 @@ public class FlowExampleServiceImpl extends ServiceImpl<FlowExampleMapper, FlowE
 
 
         //赋值节点耗时
         //赋值节点耗时
         for (FlowExampleVo record : records) {
         for (FlowExampleVo record : records) {
-            record.setDurationStr(DateUtil.formatBetween(record.getDurationBeginTime(), new Date(), BetweenFormatter.Level.MINUTE));
+            if(ObjectUtil.isNotEmpty(record.getDurationBeginTime())) {
+                record.setDurationStr(DateUtil.formatBetween(record.getDurationBeginTime(), new Date(), BetweenFormatter.Level.MINUTE));
+            }
         }
         }
 
 
         // 赋值流程发起人名称
         // 赋值流程发起人名称

+ 3 - 0
hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowProcessServiceImpl.java

@@ -827,6 +827,9 @@ public class FlowProcessServiceImpl implements FlowProcessService {
      * 创建待办信息
      * 创建待办信息
      */
      */
     void createPendingInfo(List<FlowDefinitionNode> jumpNodeList, Long flowId) {
     void createPendingInfo(List<FlowDefinitionNode> jumpNodeList, Long flowId) {
+        if (ObjectUtil.isEmpty(jumpNodeList)) {
+            throw new ServiceException("未找到有效的下一节点信息!");
+        }
         List<FlowExampleCurrent> flowExampleCurrentList = new ArrayList<>();
         List<FlowExampleCurrent> flowExampleCurrentList = new ArrayList<>();
         for (FlowDefinitionNode flowDefinitionNode : jumpNodeList) {
         for (FlowDefinitionNode flowDefinitionNode : jumpNodeList) {
             String jumpHandleUserId = flowDefinitionNode.getJumpHandleUserId();
             String jumpHandleUserId = flowDefinitionNode.getJumpHandleUserId();