修改bug

mitao

2024-06-21 ee9688b912bb993b54252a26f8ad9e0e04df21c3

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -309,15 +309,16 @@
        if (StringUtils.isNull(sysUser)) {
            return R.fail("用户名或密码错误");
        }
        // 角色集合
        Set<String> roles = permissionService.getRolePermission(sysUser);
        // 权限集合
        Set<String> permissions = permissionService.getMenuPermission(sysUser);
        LoginUser sysUserVo = new LoginUser();
        sysUserVo.setSysUser(sysUser);
        sysUserVo.setRoles(roles);
        sysUserVo.setPermissions(permissions);

        if (sysUser.getUserType().equals("00")) {
            // 角色集合
            Set<String> roles = permissionService.getRolePermission(sysUser);
            // 权限集合
            Set<String> permissions = permissionService.getMenuPermission(sysUser);
            sysUserVo.setRoles(roles);
            sysUserVo.setPermissions(permissions);
        }
        return R.ok(sysUserVo);
    }

@@ -510,6 +511,15 @@
        return R.ok(user);
    }

//    @PostMapping("/queryUserByPhone1")
//    public R<SysUser>  queryUserByPhone1(@RequestBody String phone){
//        SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
//                .eq(SysUser::getPhonenumber, phone)
//                .eq(SysUser::get, phone)
//                .last("LIMIT 1"));
//        return R.ok(user);
//    }


    /**
     * 通过账号查询用户