From 39da18419d1728698ff12e7da6fab20285aff491 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 5 Jul 2022 16:14:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E8=AE=BE=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 84697d47d..aac2ae779 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -2163,32 +2163,22 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				//实施类别 implementType
 				if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getImplementType())){
 					projectLawsInventoryEOTemp.setImplementType(projectLawsInventoryEO.getImplementType());
-				}else{
-					projectLawsInventoryEOTemp.setImplementType("");
 				}
 				//认证类型  attestationType
 				if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationType())){
 					projectLawsInventoryEOTemp.setAttestationType(projectLawsInventoryEO.getAttestationType());
-				}else{
-					projectLawsInventoryEOTemp.setAttestationType("");
 				}
 				//认证级别  attestationRank
 				if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())){
 					projectLawsInventoryEOTemp.setAttestationRank(projectLawsInventoryEO.getAttestationRank());
-				}else{
-					projectLawsInventoryEOTemp.setAttestationRank("");
 				}
 				//责任领域  dutyTerritory
 				if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())){
 					projectLawsInventoryEOTemp.setDutyTerritory(projectLawsInventoryEO.getDutyTerritory());
-				}else{
-					projectLawsInventoryEOTemp.setDutyTerritory("");
 				}
 				//适用地区region
 				if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getRegion())){
 					projectLawsInventoryEOTemp.setRegion(projectLawsInventoryEO.getRegion());
-				}else{
-					projectLawsInventoryEOTemp.setRegion("");
 				}
 				//在产车实施日期implementTime
 				if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getImplementTime())){
@@ -2213,14 +2203,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				projectLawsInventoryEOList.add(projectLawsInventoryEOTemp);
 			}
 
-//			this.updateBatchById(projectLawsInventoryEOList);
-			for (ProjectLawsInventoryEO lawsInventoryEO : projectLawsInventoryEOList) {
-				LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
-				updateWrapper.in(ProjectLawsInventoryEO::getId,lawsInventoryEO.getId());
-				setDateNull(lawsInventoryEO, updateWrapper);
-				//保存
-				this.update(lawsInventoryEO,updateWrapper);
-			}
+			this.updateBatchById(projectLawsInventoryEOList);
+//			for (ProjectLawsInventoryEO lawsInventoryEO : projectLawsInventoryEOList) {
+//				LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
+//				updateWrapper.in(ProjectLawsInventoryEO::getId,lawsInventoryEO.getId());
+//				setDateNull(lawsInventoryEO, updateWrapper);
+//				//保存
+//				this.update(lawsInventoryEO,updateWrapper);
+//			}
 
 			//更新log
 			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();