From 1cc1c415321e6738842e89ce0a3e190fa462351b Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 29 Nov 2023 11:24:40 +0800
Subject: [PATCH] 水库填报修复

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbNorspiServiceImpl.java |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbNorspiServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbNorspiServiceImpl.java
index 9f21919..baedeaf 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbNorspiServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbNorspiServiceImpl.java
@@ -151,13 +151,8 @@
 		setUpdateLog(oldList,newList);
 		// 更新审核日志
 		setUpdateCheckLog(oldList,newList);
-
-		// 取旧数据和新提交数据交集--更新
-		List<TbAttResRsbNorspi> updateList = newList.stream().filter(vo -> oldList.stream().map(e ->
-			e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
-
 		// 更新数据
-		boolean batch = updateBatchById(updateList);
+		boolean batch = updateBatchById(newList);
 		if (batch){
 			if (!edit) {
 				tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), newList.get(0).getCheckState());

--
Gitblit v1.9.3