irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix

Browse Source
This commit is contained in:
admin
2024-07-24 21:48:52 +08:00
parent 7ccfde6ead
commit 3029bffadf
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkArticleInfoController.java
View File

@@ -36,7 +36,7 @@ public class PlayClerkArticleInfoController {
*/
@PostMapping("/listByPage")
public R list(@Validated @RequestBody PlayClerkArticleQueryVo vo) {
IPage<PlayClerkArticleReturnVo> list = playClerkArticleInfoService.selectByPage(vo);
IPage<PlayClerkArticleReturnVo> list = playClerkArticleInfoService.selectByPage(vo,false);
return R.ok(list);
}

4
play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkArticleInfoService.java
View File

@@ -29,9 +29,11 @@ public interface IPlayClerkArticleInfoService extends IService<PlayClerkArticleI
* 查询店员动态信息列表
*
* @param vo 店员动态信息查询对象
* @param searchByYourself 查询人是否是自己
*
* @return 店员动态信息集合
*/
IPage<PlayClerkArticleReturnVo> selectByPage(PlayClerkArticleQueryVo vo);
IPage<PlayClerkArticleReturnVo> selectByPage(PlayClerkArticleQueryVo vo, boolean searchByYourself);
/**

8
play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkArticleInfoServiceImpl.java
View File

@@ -61,7 +61,7 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl<PlayClerkArticl
* @return 店员动态信息
*/
@Override
public IPage<PlayClerkArticleReturnVo> selectByPage(PlayClerkArticleQueryVo vo) {
public IPage<PlayClerkArticleReturnVo> selectByPage(PlayClerkArticleQueryVo vo, boolean searchByYourself) {
MPJLambdaWrapper<PlayClerkArticleInfoEntity> lambdaQueryWrapper = new MPJLambdaWrapper<>();
//查询主表全部字段
lambdaQueryWrapper.selectAll(PlayClerkArticleInfoEntity.class);
@@ -81,11 +81,11 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl<PlayClerkArticl
if (vo.getReleaseTime() != null && vo.getReleaseTime().size() == 2) {
lambdaQueryWrapper.between(PlayClerkArticleInfoEntity::getReleaseTime, vo.getReleaseTime().get(0), vo.getReleaseTime().get(1));
}
// 加入组员的筛选
if (!searchByYourself) {
// 后台查询时，加入组员的筛选
List<String> clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), null);
lambdaQueryWrapper.in(PlayClerkArticleInfoEntity::getClerkId, clerkIdList);
}
IPage<PlayClerkArticleReturnVo> page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkArticleReturnVo.class, lambdaQueryWrapper);
for (PlayClerkArticleReturnVo record : page.getRecords()) {
int index = 0;

2
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxArticleController.java
View File

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