From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterBlockServiceImpl.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterBlockServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterBlockServiceImpl.java
index 1ff3e47..92432bb 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterBlockServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterBlockServiceImpl.java
@@ -220,10 +220,8 @@
if (newTbAttResWaterBlock.getCheckState()==4){
fillName = "编辑";
// 找到相关的 guid 数据
- for (TbAttResWaterBlock tbAttResWaterBlock : oldList) {
- if (tbAttResWaterBlock.getGuid().equals(newTbAttResWaterBlock.getGuid())){
- newTbAttResWaterBlock.setCheckState(tbAttResWaterBlock.getCheckState());
- }
+ if (oldList.size()>0){
+ newTbAttResWaterBlock.setCheckState(oldList.get(0).getCheckState());
}
}
--
Gitblit v1.9.3