From 7d223f589518bd7094ba44531437677c902af40a Mon Sep 17 00:00:00 2001
From: dd <gitluke@outlook.com>
Date: Tue, 04 Nov 2025 00:46:50 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/im/util/UserPolicyUtils.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/util/UserPolicyUtils.java b/ruoyi-admin/src/main/java/com/ruoyi/im/util/UserPolicyUtils.java
index 7af01b0..67186a2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/util/UserPolicyUtils.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/util/UserPolicyUtils.java
@@ -26,7 +26,7 @@
return userPolicyList.stream()
.filter(policy -> policy != null &&
policy.getUserId() != null &&
- policy.getPolicyStatus() != null)
+ policy.getPolicyStatus() != null && policy.getApprovalStatus() == 1)
.filter(policy -> userId.equals(policy.getUserId()))
.anyMatch(policy -> UserPolicy.PolicyStatus.ACTIVE.equals(policy.getPolicyStatus()));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java
index 8424adb..593cc03 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java
@@ -494,7 +494,7 @@
}
userPolicy.setPayStatus(2); // 2-支付成功
- userPolicy.setPolicyStatus(UserPolicy.PolicyStatus.ACTIVE);
+// userPolicy.setPolicyStatus(UserPolicy.PolicyStatus.ACTIVE);
userPolicy.setUpdatedAt(new Date());
boolean updateResult = userPolicyService.updateById(userPolicy);
--
Gitblit v1.9.3