From c1fce70fd7fe0e7e36811102f716c02fcc80336c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 26 May 2022 15:40:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E8=AE=A2?= =?UTF-8?q?=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dummy/service/impl/DummyInventoryBaseEOServiceImpl.java | 2 +- .../home/service/impl/HomeFunctionModuleEOServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 cd25c8aac..19c77f628 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 @@ -174,7 +174,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl ids = records.stream().map(DummyInventoryBaseEO::getId).collect(Collectors.toList()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(DummyReadEO::getDummyInventoryBaseId, ids); + wrapper.in(DummyReadEO::getDummyInventoryBaseId, ids).in(DummyReadEO::getCreateBy,sysUser.getUsername()); List dummyReadEOS = iDummyReadEOService.list(wrapper); List dummyReadIdList = dummyReadEOS.stream().map(DummyReadEO::getDummyInventoryBaseId).collect(Collectors.toList()); for (DummyInventoryBaseEO record : pageList.getRecords()) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java index ee0d28743..21533edcd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java @@ -112,7 +112,7 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl wrapperTemp = new LambdaQueryWrapper<>(); wrapperTemp.in(HomeFunctionModuleEO::getCreateBy,loginUser.getUsername()).orderByAsc(HomeFunctionModuleEO::getState).orderByAsc(HomeFunctionModuleEO::getSort); List homeFunctionModuleEOS = this.list(wrapperTemp); - if(homeFunctionModuleEOList.size() == 0){ + if(homeFunctionModuleEOS.size() == 0){ if(CutEnum.EN.getValue().equals(cut)){ for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOList) { homeFunctionModuleEO.setIconName(homeFunctionModuleEO.getIconNameEn());