From 63f00512cc3401ef04d16503d392c8816d2a3545 Mon Sep 17 00:00:00 2001
From: cuijiaming <1410452759@qq.com>
Date: Fri, 7 Apr 2023 16:21:54 +0800
Subject: [PATCH] =?UTF-8?q?bug67980=E5=92=8C67987=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryInfoEOServiceImpl.java | 31 ++++++++++---------
 1 file changed, 17 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 bcbc5a8fd..ecd46c645 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
@@ -294,11 +294,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())){
@@ -900,14 +900,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)){
@@ -1138,12 +1138,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{
@@ -2831,6 +2831,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				}
 
 				if(oSSFileList.size() != 0){
+					if(serialNumber.contains("/")){
+						serialNumber = serialNumber.replaceAll("/","-");
+					}
 					String fileNowPath = uploadpath + "/tempZip/" + serialNumber;
 					File file = new File(fileNowPath);
 					if (file.exists()) {