From a001f8e65f86754b63ffeeb53068ce61a34b22db Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 23 Aug 2022 11:41:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0log=E5=8E=BB=E6=8E=89=E7=BC=96=E8=BE=91,=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B6,=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 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 f3424e520..1013b4130 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
@@ -426,7 +426,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			Map<String, String> infoDiffEn = ListDiff.compareObject(dataListCopy.get(0),projectLawsInventoryEOCopy);
 
 			//设置更新log
-			setContentLog(infoDiff,contentLog,infoDiffEn,enContentLog,projectLawsInventoryEO.getProjectLibraryId());
+//			setContentLog(infoDiff,contentLog,infoDiffEn,enContentLog,projectLawsInventoryEO.getProjectLibraryId());
 
 
 			//验证用户是否是该法规上级 项目库的studio， 如果是，则同步更新流程
@@ -2593,14 +2593,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			this.saveBatch(projectLawsInventoryEOList);
 
 			//更新log
-			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-			String username = sysUser.getUsername();
-			String projectLibraryId = projectLawsInventoryEOList.get(0).getProjectLibraryId();
-			String serialNumber = projectLawsInventoryEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
-			String contentLog = username+"复制了“"+serialNumber+"”";
-			String enContentLog =  username+" copied “"+serialNumber+"”";
-			projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
-			projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
+//			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//			String username = sysUser.getUsername();
+//			String projectLibraryId = projectLawsInventoryEOList.get(0).getProjectLibraryId();
+//			String serialNumber = projectLawsInventoryEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
+//			String contentLog = username+"复制了“"+serialNumber+"”";
+//			String enContentLog =  username+" copied “"+serialNumber+"”";
+//			projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
+//			projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
 			this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
 		}
 
@@ -2867,15 +2867,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			String enContentIndexStart = enContentLog.substring(0,enContentLog.indexOf("“"));
 			String enContent= enContentLog.substring(enContentIndexStart.length()+1,enContentLog.length());
 
-			if(StringUtils.isNotBlank(content)){
-				contentLog = contentLog.substring(0, contentLog.length() - 5) + "”";
-				projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
-			}
+//			if(StringUtils.isNotBlank(content)){
+//				contentLog = contentLog.substring(0, contentLog.length() - 5) + "”";
+//				projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
+//			}
 
-			if(StringUtils.isNotBlank(enContent)){
-				enContentLog = enContentLog.substring(0, enContentLog.length() - 5) + "”";
-				projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
-			}
+//			if(StringUtils.isNotBlank(enContent)){
+//				enContentLog = enContentLog.substring(0, enContentLog.length() - 5) + "”";
+//				projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
+//			}
 		}
 	}