From d589c572bde9778a98a957b5f60c0c79b278ecee Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 1 Nov 2022 14:55:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95--=E5=AF=B9?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=BC=80=E6=94=BE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryBaseEOServiceImpl.java        | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 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 6af72e8d9..f8096ac4e 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
@@ -250,10 +250,14 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
     @Override
     public IPage<DummyInventoryBaseEO> getPageInfo(Page<DummyInventoryBaseEO> page, QueryWrapper<DummyInventoryBaseEO> queryWrapper) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        queryWrapper.and(query->{
-            query.in("create_by",sysUser.getUsername()).in("state",InventoryStateEnum.DRAFT.getValue())
-                    .or().in("state",InventoryStateEnum.ISSUE.getValue());
-        });
+        //系统管理
+        boolean administrator = sysUserService.isAdministrator();
+        if(!administrator){
+            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());
 //        });