diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index a71c6ec1c..aaae03a61 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -462,15 +462,14 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl e.getSerialNumber()).collect(Collectors.joining(",")); + if(list.size() != 0){//原详情为空,查所有数据,不限时间 QueryWrapper logEOQueryWrapper = new QueryWrapper<>(); logEOQueryWrapper.orderByAsc("create_time") - .between("create_time",lastIssueTime,now) +// .between("create_time",lastIssueTime,now) .eq("dummy_inventory_base_id",dummyInventoryBaseEO.getId()) .eq("is_en_log",CutEnum.EN.getValue()); List updateLogList = dummyLogEOService.list(logEOQueryWrapper); - contentLog = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.joining(",")); + contentLog = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.joining("
")); iDummyContentChangeEOService.saveBatch(list); sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(),contentLog ,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());