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 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 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); }