From 829f71fb287686d6db6d720ce7cced8dea2f9c95 Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Mon, 27 Mar 2023 16:58:42 +0800
Subject: [PATCH] =?UTF-8?q?67051=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0log=E5=85=A8=E8=AE=B0=E5=BD=95=E3=80=82?=
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 d47c120e1..0cde55614 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
@@ -590,7 +590,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， 如果是，则同步更新流程
@@ -3752,14 +3752,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);
 			projectTaskInventoryEOList.forEach(taskInventory -> {
 				this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId());
@@ -4052,15 +4052,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());
+			}
 		}
 	}