From 68b36adf0cc7b19ece21cb929512af08483cfeb2 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Apr 2022 13:46:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DummyInventoryBaseEOServiceImpl.java    | 9 ++++++---
 1 file changed, 6 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 7a8ead7c8..69488792d 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
@@ -126,10 +126,13 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
     @Override
     public IPage<DummyInventoryBaseEO> getPageInfo(Page<DummyInventoryBaseEO> page, QueryWrapper<DummyInventoryBaseEO> 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());
+        queryWrapper.and(query->{
+            query.in("create_by",sysUser.getUsername()).in("state",InventoryStateEnum.DRAFT.getValue())
+                    .or().in("state",InventoryStateEnum.ISSUE.getValue());
         });
+//        queryWrapper.or(query->{
+//            query.in("state",InventoryStateEnum.ISSUE.getValue());
+//        });
         IPage<DummyInventoryBaseEO> pageList = this.page(page, queryWrapper);
         if (pageList.getRecords().size() != 0) {
             List<DummyInventoryBaseEO> records = pageList.getRecords();