From ee2d95da91376b5bcf88816008928d45ca10dad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 30 Mar 2026 12:43:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(website):=20=E6=B7=BB=E5=8A=A0=E7=BD=91?=
 =?UTF-8?q?=E7=AB=99=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84=E5=8D=8F=E4=BD=9C?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在CmsWebsiteParam中新增memberUserId参数用于协作成员筛选
- 修改CmsWebsiteMapper.xml添加按memberUserId查询的SQL逻辑
- 实现通过app_user表关联查询指定用户的协作网站列表
- 支持同时查询用户直接创建和作为成员参与的网站
- 保持原有websiteIds和keywords查询条件的兼容性
---
 .../com/gxwebsoft/cms/mapper/xml/CmsWebsiteMapper.xml    | 9 +++++++++
 .../java/com/gxwebsoft/cms/param/CmsWebsiteParam.java    | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsWebsiteMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsWebsiteMapper.xml
index 577c1c6..8d4fd7f 100644
--- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsWebsiteMapper.xml
+++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsWebsiteMapper.xml
@@ -430,6 +430,15 @@
           #{item}
         </foreach>
       </if>
+      <if test="param.memberUserId != null">
+        AND (
+          a.user_id = #{param.memberUserId}
+          OR a.website_id IN (
+            SELECT website_id FROM app_user
+            WHERE user_id = #{param.memberUserId} AND deleted = 0
+          )
+        )
+      </if>
       <if test="param.keywords != null">
         AND (a.website_name LIKE CONCAT('%', #{param.keywords}, '%')
         OR a.website_code LIKE CONCAT('%', #{param.keywords}, '%')
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsWebsiteParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsWebsiteParam.java
index cafb74d..6236415 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsWebsiteParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsWebsiteParam.java
@@ -214,6 +214,9 @@ public class CmsWebsiteParam extends BaseParam {
     @Schema(description = "按WebsiteIds集搜索")
     private Set<Integer> websiteIds;
 
+    @Schema(description = "协作成员userId（查该用户作为成员参与的应用，联表 app_user）")
+    private Integer memberUserId;
+
     @Schema(description = "当前登录用户ID")
     @QueryField(type = QueryType.EQ)
     private Integer loginUserId;