瀏覽代碼

bug修复

yzc 2 年之前
父節點
當前提交
79abde56df

+ 6 - 4
hx-common/service-flow/src/main/java/com/fjhx/feign/FlowClient.java

@@ -300,10 +300,12 @@ public class FlowClient implements IFlowClient {
             Assert.notEmpty(processNode, FlowExplainConstant.SPECIFY_BRANCH_EMPTY);
         }
 
-        jumpVo.setJumpNodeId(processNode.getId());
-        jumpVo.setJumpNodeCode(processNode.getCode());
-        jumpVo.setHandleObjectType(processNode.getHandleObjectType());
-        jumpVo.setHandleObjectIdSet(processNode.getHandleObjectIdSet());
+        if(ObjectUtil.isNotEmpty(processNode)) {
+            jumpVo.setJumpNodeId(processNode.getId());
+            jumpVo.setJumpNodeCode(processNode.getCode());
+            jumpVo.setHandleObjectType(processNode.getHandleObjectType());
+            jumpVo.setHandleObjectIdSet(processNode.getHandleObjectIdSet());
+        }
 
     }
 

+ 1 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/service/logistics/impl/LogisticsInfoServiceImpl.java

@@ -313,7 +313,7 @@ public class LogisticsInfoServiceImpl extends ServiceImpl<LogisticsInfoMapper, L
             deliverDetailsVo.setProductId(item.getGoodsId());
             deliverDetailsVo.setPurchaseId(item.getPurchaseId());
             deliverDetailsVo.setApplyPurchaseId(item.getId());
-            deliverDetailsVo.setPurchaseQuantity(item.getQuantity());
+            deliverDetailsVo.setPurchaseQuantity(item.getPurchaseQuantity());
 
             // 赋值产品信息
             ProductInfo productInfo = productMap.get(item.getGoodsId());