From 47aed74050e956919f2eee588fbab15607cf4029 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 31 十月 2023 17:20:31 +0800
Subject: [PATCH] zjh 2023/10/31--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 39a0fb8..2d1d498 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -540,7 +540,8 @@
return AjaxResult.success("鎿嶄綔澶辫触");
}
for (TjOrderRemark orderRemark : remarklList) {
- if (null != orderRemark.getSummaryList() && orderRemark.getSummaryList().size()>0 ) {
+ List<String> summaryList = orderRemark.getSummaryList();
+ if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null) ) {
orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
}
LambdaQueryWrapper<TjOrder> qw = new LambdaQueryWrapper<>();
@@ -581,7 +582,6 @@
}
}
}
- //-----------------------------------end
asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order);
LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
@@ -600,7 +600,7 @@
remarkService.save(remark);
} else {
one.setRemark(orderRemark.getRemark());
- if (orderRemark.getSummaryList() != null) {
+ if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null)) {
one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
}
one.setDeptId(orderRemark.getDeptId());
--
Gitblit v1.8.0