1

dd

2025-10-27 11ffae1ecbe3d26863fd51262d7ffb043eb089da

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java

@@ -60,6 +60,22 @@
        // 创建查询条件包装器
        LambdaQueryWrapper<UserAccount> queryWrapper = new LambdaQueryWrapper<>();


        LambdaQueryWrapper<UserPolicy> userPolicyWrapper = new LambdaQueryWrapper<>();
        userPolicyWrapper
                .eq(UserPolicy::getApprovalStatus, 1)
                .eq(UserPolicy::getPayStatus,2)
                .select(UserPolicy::getUserId);
        List<UserPolicy> userPolicies = userPolicyService.list(userPolicyWrapper);
        List<Integer> userIds = userPolicies.stream()
                .map(UserPolicy::getUserId)
                .collect(Collectors.toList());
        if(null != vo.getActivate() && vo.getActivate()){
            queryWrapper.in(UserAccount::getId,userIds);
        }else if(null != vo.getActivate() && !vo.getActivate()){
            queryWrapper.notIn(UserAccount::getId,userIds);
        }

        if (ObjectUtil.isNotEmpty(vo.getKeywords())) {
            String keywords = vo.getKeywords().trim();
            if (StringUtils.isNotEmpty(keywords)) {
@@ -212,6 +228,10 @@
        // 转换为输出对象
        List<UserAccountOut> allSubordinateOuts = ConverterUtil.convertToList(allSubordinates, UserAccountOut.class);

        // === 新增：为下级用户设置激活状态 ===
        setActivateStatusForUsers(allSubordinateOuts);
        // =================================

        // 收集所有需要设置 KYC 的用户（当前层级 + 下级）
        List<UserAccountOut> allUsers = new ArrayList<>();
        allUsers.addAll(userAccountOuts);
@@ -234,6 +254,41 @@
                user.setSubordinateList(new ArrayList<>());
            }
        }
    }

    /**
     * 为用户列表设置激活状态
     */
    private void setActivateStatusForUsers(List<UserAccountOut> users) {
        if (ObjectUtil.isEmpty(users)) {
            return;
        }

        // 收集用户ID
        List<Integer> idList = users.stream()
                .map(UserAccountOut::getId)
                .filter(ObjectUtil::isNotEmpty)
                .collect(Collectors.toList());

        if (idList.isEmpty()) {
            return;
        }

        // 批量查询激活状态
        LambdaQueryWrapper<UserPolicy> userPolicyWrapper = new LambdaQueryWrapper<>();
        userPolicyWrapper.in(UserPolicy::getUserId, idList)
                .eq(UserPolicy::getApprovalStatus, 1)
                .select(UserPolicy::getUserId);

        List<UserPolicy> policyList = userPolicyService.list(userPolicyWrapper);
        Set<Integer> activatedUserIds = policyList.stream()
                .map(UserPolicy::getUserId)
                .collect(Collectors.toSet());

        // 设置激活状态
        users.forEach(user -> {
            user.setActivate(activatedUserIds.contains(user.getId()));
        });
    }

    /**
@@ -351,10 +406,10 @@
                    return AjaxResult.error("手机号格式不正确！");
                }
            }
            if(StringUtils.isNotEmpty(vo.getPassword()) && StringUtils.isEmpty(vo.getOldPassword())){
            if(null == vo.getStatus() && StringUtils.isNotEmpty(vo.getPassword()) && StringUtils.isEmpty(vo.getOldPassword())){
                return AjaxResult.error("旧密码不能为空！");
            }
            if(StringUtils.isNotEmpty(vo.getPassword())){
            if(null == vo.getStatus() && StringUtils.isNotEmpty(vo.getPassword())){
                String s = SymmetricCryptoUtil.decryptPassword(userAccount.getPassword());
                if(!vo.getOldPassword().equals(s)){
                    return AjaxResult.error("旧密码不正确！");