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> 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 ServiceImple.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