puzhibing
2024-02-28 10f1422bc8f401b06b1e55ee63b23016d74abce8
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -954,7 +954,11 @@
                            List<Long> userIds = sysUserService.getUserIdsByDept(sysUser.getUserId()).getData();
                            // 获取店铺ids
                            List<Long> data = shopService.getShopIdsByUserIds(userIds).getData();
                            scope.addAll(data);
                            if (data.size()==0){
                                scope.add(0L);
                            }else{
                                scope.addAll(data);
                            }
                            break;
                        case "5":
                            // 仅个人数据 查询当前登陆人关联店铺下的用户
@@ -962,7 +966,12 @@
                            longs.add(sysUser.getUserId());
                            // 获取店铺ids
                            List<Long> data1 = shopService.getShopIdsByUserIds(longs).getData();
                            scope.addAll(data1);
                            if (data1.size()==0){
                                scope.add(0L);
                            }else{
                                scope.addAll(data1);
                            }
                            break;
                    }
                }
@@ -1232,6 +1241,13 @@
        return memberMapper.listIdBySendType(sendType,shopId);
    }
    public List<Long> listIdBySendType2(Long shopId) {
        //1.手动领取2.全部用户3.会员用户4非会员用户5自定义
        return memberMapper.listIdBySendType2(shopId);
    }
    /**
     * @param userIds
     * @return List<MgtSimpleMemberVo>