From 65cde0b8f5b40483360b5754fa7fe2494f4030cb Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Tue, 28 Apr 2026 13:11:57 +0800
Subject: [PATCH] =?UTF-8?q?TASK:admin-organization=20plan=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ai/da/model/vo/QueryUserConditionsVO.java    | 4 ++++
 .../ai/da/service/impl/ConvenientInquiryServiceImpl.java  | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/main/java/com/ai/da/model/vo/QueryUserConditionsVO.java b/src/main/java/com/ai/da/model/vo/QueryUserConditionsVO.java
index 852ca839..2f0b0b13 100644
--- a/src/main/java/com/ai/da/model/vo/QueryUserConditionsVO.java
+++ b/src/main/java/com/ai/da/model/vo/QueryUserConditionsVO.java
@@ -34,4 +34,8 @@ public class QueryUserConditionsVO extends PageQueryBaseVo {
 
     private Integer systemUser;
 
+    private Long subscriptionPlanId;
+
+    private Long organizationId;
+
 }
diff --git a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
index 62b6d62b..69860284 100644
--- a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
@@ -787,6 +787,14 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
             queryWrapper.lt("create_date", queryUserConditionsVO.getEndTime());
         }
 
+        if (!Objects.isNull(queryUserConditionsVO.getSubscriptionPlanId())) {
+            queryWrapper.eq("subscription_plan_id", queryUserConditionsVO.getSubscriptionPlanId());
+        }
+
+        if (!Objects.isNull(queryUserConditionsVO.getOrganizationId())) {
+            queryWrapper.eq("organization_id", queryUserConditionsVO.getOrganizationId());
+        }
+
         // 排序
         if (!StringUtils.isNullOrEmpty(queryUserConditionsVO.getOrder()) && !StringUtils.isNullOrEmpty(queryUserConditionsVO.getOrderBy())) {
             String orderBy = "id";