From df489326a7eb737a7e57e6f3e37290a92e28f96f Mon Sep 17 00:00:00 2001
From: dd3s_206 <zhaoxinyu0716@gmail.com>
Date: Sat, 16 May 2026 11:14:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BAh5=E7=AB=AF-=E6=83=A0?=
 =?UTF-8?q?=E6=B0=91=E6=9C=8D=E5=8A=A1=EF=BC=9A=20=EF=BC=88=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=20EXISTS=20=E4=BB=A3=E6=9B=BF=20JOIN=EF=BC=89?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=A0=E4=B8=BA=E4=BA=BA=E5=91=98=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4userId=E9=87=8D=E5=A4=8D=E5=AF=BC=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=9F=A5=E8=AF=A2=E6=97=B6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=86=A8=E8=83=80=E9=97=AE=E9=A2=98=EF=BC=88=E5=8D=B3=E4=B8=80?=
 =?UTF-8?q?=E8=A1=8C=E5=8F=98=E5=A4=9A=E8=A1=8C=EF=BC=89=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huimin/controller/HuiminMineController.java            | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminMineController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminMineController.java
index cb18bf1..858d6aa 100644
--- a/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminMineController.java
+++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminMineController.java
@@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.Static;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.mvc.annotation.At;
@@ -50,8 +51,6 @@ public class HuiminMineController {
           t1.*
         FROM
           huimin t1
-          LEFT JOIN activity_user_scope aus ON t1.groupId = aus.groupId
-          AND aus.userId = @userId
         $condition
         """);
         Cnd cnd = Cnd.NEW();
@@ -62,8 +61,8 @@ public class HuiminMineController {
         // 添加启用状态过滤（只显示启用的记录）
         cnd.and("t1.enable", "=", true);
         // 添加权限过滤
-        cnd.and(Cnd.exps("t1.groupId", "is", null).or("aus.groupId", "is not", null));
-        sql.params().set("userId", SecurityUtil.getUserId());
+        cnd.and(Cnd.exps("t1.groupId", "is", null)
+                .or(new Static("EXISTS (SELECT 1 FROM activity_user_scope aus WHERE aus.groupId = t1.groupId AND aus.userId = '%s')".formatted(SecurityUtil.getUserId()))));
         sql.setCondition(cnd);
         Pagination pagination = huiminService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
         return Result.success(pagination);