From 5fce56146c869d346773af796e55dcd498f772d9 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 15 Oct 2025 22:01:37 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java
index eb827d6..c639b9f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java
@@ -212,6 +212,10 @@
// 转换为输出对象
List<UserAccountOut> allSubordinateOuts = ConverterUtil.convertToList(allSubordinates, UserAccountOut.class);
+ // === 新增：为下级用户设置激活状态 ===
+ setActivateStatusForUsers(allSubordinateOuts);
+ // =================================
+
// 收集所有需要设置 KYC 的用户（当前层级 + 下级）
List<UserAccountOut> allUsers = new ArrayList<>();
allUsers.addAll(userAccountOuts);
@@ -237,6 +241,41 @@
}
/**
+ * 为用户列表设置激活状态
+ */
+ 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()));
+ });
+ }
+
+ /**
* 为用户列表设置 KYC 信息
*/
private void setKycInfoForUsers(List<UserAccountOut> users) {
--
Gitblit v1.9.3