bug修改

huliguo

9 天以前 1a1e608f143bd49a000dbd0192ce9fd6c04feb6f

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java

@@ -283,10 +283,10 @@
            member.setCreateTime(new Date());
            member.setMobile(mobile);
            initMemberTotal(memberId);
            log.info("sysUser01-----------------" + sysUser.toString());
//            log.info("sysUser01-----------------" + sysUser.toString());
        } else {
            sysUser = sysUserService.getSysUser(member.getUserId()).getData();
            log.info("sysUser02-----------------" + sysUser.toString());
//            log.info("sysUser02-----------------" + sysUser.toString());
        }
        member.setWxUnionid(appUserRegisterDto.getWxUnionid());
        member.setMiniOpenid(appUserRegisterDto.getMiniOpenid());
@@ -431,6 +431,16 @@
                merMemberPageDto.setSurpStartNum(10);
                merMemberPageDto.setSurpEndNum(999999999);
            }
        }
        //今日到店用户
        if(null != merMemberPageDto.getIsTodayStore() && 1 == merMemberPageDto.getIsTodayStore()){
            List<Integer> data = remoteOrderService.countShopServicePerson(merMemberPageDto.getShopId()).getData();
            merMemberPageDto.setUserIds(data);
        }
        //有未跟进的任务用户
        if(null != merMemberPageDto.getIsTask() && 1 == merMemberPageDto.getIsTask()){
            List<Integer> data = remoteShopService.getMemberIngTotal(merMemberPageDto.getShopId()).getData();
            merMemberPageDto.setUserIds(data);
        }
        List<MerMemberPageVo> merMemberPageVoList = memberMapper.pageMerMember(page, merMemberPageDto);
        //处理活跃度返回
@@ -950,7 +960,8 @@
            merMemberPageDto.setStartBirthday(startBirthday.format(formatter));
        }
        // 获取当前登陆人的可视权限
        SysUser sysUser = SecurityUtils.getSysUser();
        SysUser sysUserId = SecurityUtils.getSysUser();
        SysUser sysUser = sysUserService.getSysUser(sysUserId.getUserId()).getData();
        // 店铺ids
        List<Long> scope = new ArrayList<>();
        if (sysUser!=null){