From 8c4968ea3bd61c154c71d40f43a2cc22760fef49 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 25 十月 2023 18:29:54 +0800
Subject: [PATCH] zjh 2023/10/25--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 2dd1583..a6cf3b9 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -991,7 +991,7 @@
if (null != ppList && ppList.size() > 0) {
//寮傛淇濆瓨鏁版嵁搴�
// asyncService.addRedisTransitionPac(cusId, pacId, ppList);
- asyncService.saveRedisTransitionByPacId(cusId, pacId, proIds);
+ asyncService.saveRedisTransitionByPacId(cusId, pacId, null);
for (TjPackageProject tjPackageProject : ppList) {
TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
if (null != project) {
@@ -1030,9 +1030,7 @@
//鍗曢」
if (null != proIds && proIds.size() > 0) {
//寮傛淇濆瓨鏁版嵁搴撹〃
-// asyncService.addRedisTransitionPro(cusId, proIds);
asyncService.saveRedisTransitionByPacId(cusId, null, proIds);
-
for (Long proId : proIds) {
List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
if (null != transitions && transitions.size() > 0) {
@@ -1059,8 +1057,10 @@
}
tbTransition.setParentProId(tjProject.getProParentId());
if (tjProject.getProParentId() != null) {
- final TjProject byId = projectService.getById(tjProject.getProParentId());
- tbTransition.setParentProName(byId.getProName());
+ TjProject byId = projectService.getById(tjProject.getProParentId());
+ if(null !=byId){
+ tbTransition.setParentProName(byId.getProName());
+ }
}
tbTransition.setParentProName("");
--
Gitblit v1.8.0