zqy
4 天以前 182b2b1d3464dc1e2dcfe83a9f11799a90e7db23
同一用户 健康模块 新增删除同一条数据
5个文件已修改
48 ■■■■ 已修改文件
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthBaseServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthHabitServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthInfoServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNowServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -119,7 +119,6 @@
    public boolean endOfLife(String username) {
        SysUser sysUser = userService.selectUserByNickName(username);
        System.out.println("[[[[[[["+sysUser);
        if (sysUser.getPaid() != null && sysUser.getPaid().equals(0) && !"4".equals(sysUser.getStatus())) {
            Date startTime = sysUser.getCreateTime();
@@ -150,13 +149,14 @@
     */
    public String login(String nickName, String password, String code, String uuid)
    {
        endOfLife(nickName);
        // 验证码校验
        validateCaptcha(nickName, code, uuid);
        // 登录前置校验
        loginPreCheck(nickName, password);
        // 用户验证
        Authentication authentication = null;
        try
        {
            UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(nickName, password);
@@ -186,6 +186,9 @@
        recordLoginInfo(loginUser.getUserId());
        endOfLife(nickName);
        SysUser sysUser = userService.selectUserByNickName(nickName);
                //.selectUserByUserName(username);
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthBaseServiceImpl.java
@@ -104,8 +104,17 @@
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        //获取到同意用户的sys_userId 只存或修改一条数据
        ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
        String uaid = zInfoUser.getUaid();
        List<ZInfoUser> byUaidToFaid = zInfoUserService.findByUaidToFaid(uaid);
        List<Long> collect = byUaidToFaid.stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
        LambdaQueryWrapper<ZHealthBase> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZHealthBase::getUid,userId);
        lqw.in(ZHealthBase::getUid,collect);
        ZHealthBase getResult = getOne(lqw);
        ZHealthBase zHealthBase = new ZHealthBase();
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthHabitServiceImpl.java
@@ -100,8 +100,16 @@
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        //获取到同意用户的sys_userId 只存或修改一条数据
        ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
        String uaid = zInfoUser.getUaid();
        List<ZInfoUser> byUaidToFaid = zInfoUserService.findByUaidToFaid(uaid);
        List<Long> collect = byUaidToFaid.stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
        LambdaQueryWrapper<ZHealthHabit> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZHealthHabit::getUid,userId);
        lqw.in(ZHealthHabit::getUid,collect);
        ZHealthHabit getResult = getOne(lqw);
        ZHealthHabit zHealthHabit = new ZHealthHabit();
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthInfoServiceImpl.java
@@ -102,8 +102,16 @@
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        //获取到同意用户的sys_userId 只存或修改一条数据
        ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
        String uaid = zInfoUser.getUaid();
        List<ZInfoUser> byUaidToFaid = zInfoUserService.findByUaidToFaid(uaid);
        List<Long> collect = byUaidToFaid.stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
        LambdaQueryWrapper<ZHealthInfo> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZHealthInfo::getUid,userId);
        lqw.in(ZHealthInfo::getUid,collect);
        ZHealthInfo getResult = getOne(lqw);
        ZHealthInfo zHealthInfo = new ZHealthInfo();
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNowServiceImpl.java
@@ -107,8 +107,16 @@
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        //获取到同意用户的sys_userId 只存或修改一条数据
        ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
        String uaid = zInfoUser.getUaid();
        List<ZInfoUser> byUaidToFaid = zInfoUserService.findByUaidToFaid(uaid);
        List<Long> collect = byUaidToFaid.stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
        LambdaQueryWrapper<ZHealthNow> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZHealthNow::getUid,userId);
        lqw.in(ZHealthNow::getUid,collect);
        ZHealthNow getResult = getOne(lqw);
        ZHealthNow zHealthNow = new ZHealthNow();