From 0e5f9e30162d441da28141a9d30cc7fba0369849 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 17 Aug 2022 20:39:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0log--=E5=8F=AA=E8=AE=B0=E5=BD=95=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=92=8C=E5=88=A0=E9=99=A4=E7=9A=84=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E4=B8=8D=E5=AF=B9=E5=85=B6=E4=BB=96=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=93=8D=E4=BD=9C=E5=81=9A=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryInfoEOServiceImpl.java | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
index 7d5fa5e92..198274289 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
@@ -236,11 +236,11 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			List<Map<String,String>> infoDiffListEn = new ArrayList<>();
 			infoDiffListEn.add(infoDiffEn);
 			if(infoDiff.size()>1) {
-				contentLog = dummyInventoryBaseEOService.setInfoDiffListContent(null, infoDiffList, contentLog);
-				enContentLog = dummyInventoryBaseEOService.setInfoDiffListContent(enContentLog, infoDiffListEn, null);
+//				contentLog = dummyInventoryBaseEOService.setInfoDiffListContent(null, infoDiffList, contentLog);
+//				enContentLog = dummyInventoryBaseEOService.setInfoDiffListContent(enContentLog, infoDiffListEn, null);
 
-				dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue());
-				dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue());
+//				dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue());
+//				dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue());
 			}
 		}else{
 			if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
@@ -362,14 +362,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				this.saveBatch(dummyInventoryInfoEOList);
 
 				//更新log
-				LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-				String username = sysUser.getUsername();
-				String projectId = dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId();
-				String serialNumber = dummyInventoryInfoEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
-				String contentLog = username+"复制了“"+serialNumber+"”";
-				String enContentLog =  username+" copied “"+serialNumber+"”.";
-				dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue());
-				dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue());
+//				LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//				String username = sysUser.getUsername();
+//				String projectId = dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId();
+//				String serialNumber = dummyInventoryInfoEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
+//				String contentLog = username+"复制了“"+serialNumber+"”";
+//				String enContentLog =  username+" copied “"+serialNumber+"”.";
+//				dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue());
+//				dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue());
 			}
 		}else{
 			if(CutEnum.CN.getValue().equals(cut)){
@@ -600,12 +600,12 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 
 				if(StringUtils.isNotBlank(content)){
 					contentLog = contentLog.substring(0, contentLog.length() - 5) + "”";
-					dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue());
+//					dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue());
 				}
 
 				if(StringUtils.isNotBlank(enContent)){
 					enContentLog = enContentLog.substring(0, enContentLog.length() - 5) + "”";
-					dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue());
+//					dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue());
 				}
 			}
 		}else{