From 934d97b2e6086db0be2772acbbe2ec33133bd77e Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 16 Oct 2025 00:13:55 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java | 16 ++++++++++++++++
1 files changed, 16 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 c639b9f..e89a724 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
@@ -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)) {
--
Gitblit v1.9.3