From 92cff3187da0fa43f2aaf0d8a71ce0653fcb2574 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 26 一月 2024 10:58:26 +0800 Subject: [PATCH] 修改数据权限bug --- ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java index 6ca20f8..7bea543 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java @@ -10,9 +10,11 @@ import com.ruoyi.system.api.domain.poji.member.BirthdayCard; import com.ruoyi.system.api.domain.poji.member.Member; import com.ruoyi.system.api.domain.poji.member.MemberGiftRecord; +import com.ruoyi.system.api.domain.poji.shop.Shop; import com.ruoyi.system.api.domain.vo.*; import com.ruoyi.system.api.model.AppMiniLoginDto; import com.ruoyi.system.api.model.AppMiniLoginVo; +import com.ruoyi.system.api.service.RemoteShopService; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -21,6 +23,7 @@ import javax.annotation.Resource; import java.util.List; +import java.util.stream.Collectors; @RestController @RequestMapping("/member") @@ -37,6 +40,13 @@ @Resource private BirthdayCardService birthdayCardService; + + @Resource + private RemoteShopService remoteShopService; + + + + /** * @description: getMember @@ -194,9 +204,11 @@ * @date 2023/6/18 16:45 */ @PostMapping("/boardMemberTotal") - public R<MgtBulletinBoardVo> boardMemberTotal(@RequestBody List<Long> userIds) + public R<MgtBulletinBoardVo> boardMemberTotal(@RequestBody BoardMemberTotalDto boardMemberTotalDto) { - MgtBulletinBoardVo bulletinBoardVo = memberService.boardMemberTotal(userIds); + List<Shop> shopList = remoteShopService.getShopBySysUserIds(boardMemberTotalDto); + List<Long> shopIds = shopList.stream().map(Shop::getShopId).collect(Collectors.toList()); + MgtBulletinBoardVo bulletinBoardVo = memberService.boardMemberTotal(shopIds); return R.ok(bulletinBoardVo); } -- Gitblit v1.7.1