From f1c182c3900532821d2237aa4a2ed596c33186a7 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 12 Apr 2022 17:50:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E9=A1=B5--=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DummyInventoryBaseEOServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 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 dfc71c10e..01d8f4d71 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 @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.vo.LoginUser; import com.jero.modules.dummy.entity.DummyInventoryBaseEO; import com.jero.modules.dummy.entity.DummyReadEO; +import com.jero.modules.dummy.enums.InventoryStateEnum; import com.jero.modules.dummy.enums.ReadFlagEnum; import com.jero.modules.dummy.mapper.DummyInventoryBaseEOMapper; import com.jero.modules.dummy.service.IDummyInventoryBaseEOService; @@ -17,12 +19,10 @@ import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; import java.util.Date; +import java.util.List; import java.util.stream.Collectors; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - /** * @Description: 虚拟清单基础表 * @Author: jero-boot @@ -112,6 +112,11 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl getPageInfo(Page page, QueryWrapper queryWrapper) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + queryWrapper.in("create_by",sysUser.getUsername()).in("state",InventoryStateEnum.DRAFT.getValue()); + queryWrapper.or(query->{ + query.in("state",InventoryStateEnum.ISSUE.getValue()); + }); IPage pageList = this.page(page, queryWrapper); if (pageList.getRecords().size() != 0) { List records = pageList.getRecords();