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