diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkArticleInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkArticleInfoController.java index 50d37dc..e7c58d3 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkArticleInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkArticleInfoController.java @@ -36,7 +36,7 @@ public class PlayClerkArticleInfoController { */ @PostMapping("/listByPage") public R list(@Validated @RequestBody PlayClerkArticleQueryVo vo) { - IPage list = playClerkArticleInfoService.selectByPage(vo); + IPage list = playClerkArticleInfoService.selectByPage(vo,false); return R.ok(list); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkArticleInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkArticleInfoService.java index ecba840..d6791e7 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkArticleInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkArticleInfoService.java @@ -29,9 +29,11 @@ public interface IPlayClerkArticleInfoService extends IService selectByPage(PlayClerkArticleQueryVo vo); + IPage selectByPage(PlayClerkArticleQueryVo vo, boolean searchByYourself); /** diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkArticleInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkArticleInfoServiceImpl.java index 9b003b0..8f53bbe 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkArticleInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkArticleInfoServiceImpl.java @@ -61,7 +61,7 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl selectByPage(PlayClerkArticleQueryVo vo) { + public IPage selectByPage(PlayClerkArticleQueryVo vo, boolean searchByYourself) { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>(); //查询主表全部字段 lambdaQueryWrapper.selectAll(PlayClerkArticleInfoEntity.class); @@ -81,11 +81,11 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), null); - lambdaQueryWrapper.in(PlayClerkArticleInfoEntity::getClerkId, clerkIdList); - - + if (!searchByYourself) { + // 后台查询时,加入组员的筛选 + List clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), null); + lambdaQueryWrapper.in(PlayClerkArticleInfoEntity::getClerkId, clerkIdList); + } IPage page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkArticleReturnVo.class, lambdaQueryWrapper); for (PlayClerkArticleReturnVo record : page.getRecords()) { int index = 0; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxArticleController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxArticleController.java index 56d955c..96c0fa0 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxArticleController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxArticleController.java @@ -79,7 +79,7 @@ public class WxArticleController { @PostMapping("/clerk/listByPage") public R clerkListByPage(@Validated @RequestBody PlayClerkArticleQueryVo vo) { vo.setClerkId(ThreadLocalRequestDetail.getClerkUserInfo().getId()); - return R.ok(playClerkArticleInfoService.selectByPage(vo)); + return R.ok(playClerkArticleInfoService.selectByPage(vo,true)); }