From 8f606ffcb48ca552ea3962c3eb0383f6e80a4206 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 29 Dec 2022 14:46:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E4=B8=8D=E5=81=9A=E6=9D=83=E9=99=90=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryBaseEOServiceImpl.java | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 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 e7692c4c6..e20bfa87c 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
@@ -252,17 +252,16 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
     @Override
     public IPage<DummyInventoryBaseEO> getPageInfo(Page<DummyInventoryBaseEO> page, QueryWrapper<DummyInventoryBaseEO> queryWrapper) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        //下面注释掉的代码，是用于区分权限的，2022-12-29变更的时候注释掉的，后面如果要是需要添加权限的时候，再将一下注释的几行代码放开即可-----------------------------------
         //系统管理
-        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());
-//        });
+//        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());
+//            });
+//        }
+        //--------------------------------------------------------------------------------------------------------------------------------------------------
         IPage<DummyInventoryBaseEO> pageList = this.page(page, queryWrapper);
         if (pageList.getRecords().size() != 0) {
             List<DummyInventoryBaseEO> records = pageList.getRecords();