From a03d84609a9d438d289685d034099626367ec9ad Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Tue, 14 Nov 2023 13:59:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=B9?=
 =?UTF-8?q?=E6=AF=94):=2078390?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsCustomCompareInfoServiceImpl.java       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java
index 8773a935..1fe9cc95 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java
@@ -77,6 +77,7 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl<LawsCustomComp
     private final ISysDictItemService sysDictItemService;
     private final IOSSFileService iossFileService;
     public static final String STANDARD_NUMBER = "standard_number";
+    public static final String IS_SHOW = "is_show";
 
     public LawsCustomCompareInfoServiceImpl(LawsCustomCompareInfoMapper lawsCustomCompareInfoMapper,
                                             ILawsCustomCompareInfoStandardService lawsCustomCompareInfoStandardService,
@@ -112,16 +113,19 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl<LawsCustomComp
             queryWrapper.and(qw -> list.forEach(v -> qw.or(iqw -> iqw.like("referenceCountry", v))));
         }
         queryWrapper.like(StringUtils.isNotBlank(lawsCustomCompareInfoVO.getAuthor()), "realname", lawsCustomCompareInfoVO.getAuthor());
-        queryWrapper.like(StringUtils.isNotBlank(lawsCustomCompareInfoVO.getIsShow()), "is_show", lawsCustomCompareInfoVO.getIsShow());
+        queryWrapper.like(StringUtils.isNotBlank(lawsCustomCompareInfoVO.getIsShow()), IS_SHOW, lawsCustomCompareInfoVO.getIsShow());
 
-        // 数据权限，默认只能查看公开的数据和操作人是当前登录人数据，管理员查看所有
+        // 数据权限，默认只能查看公开的数据和操作人是当前登录人的数据，管理员查看所有
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         List<String> roleIds = Arrays.asList(loginUser.getRoleIds().split(","));
         if (!roleIds.contains("admin")){
-            queryWrapper.eq("create_by", loginUser.getId());
-            queryWrapper.eq("is_show", LawsCustomCompareCommon.IS_SHOW_1);
+            queryWrapper.and(qw ->
+                                qw.and(qwi -> qwi.eq(IS_SHOW, LawsCustomCompareCommon.IS_SHOW_0)
+                                                .eq("create_by", loginUser.getUsername()))
+                                .or().eq(IS_SHOW, LawsCustomCompareCommon.IS_SHOW_1));
         }
         queryWrapper.eq("del_flag", 0);
+        queryWrapper.orderByDesc("create_time");
         return lawsCustomCompareInfoMapper.queryByPage(new Page<>(pageNo, pageSize), queryWrapper);
     }