From b1dac74d37436c91646fb849813c0012a6703862 Mon Sep 17 00:00:00 2001
From: dd3s_206 <zhaoxinyu0716@gmail.com>
Date: Fri, 29 May 2026 11:33:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=88=B1=E5=BF=83=E5=B8=AE=E6=89=B6=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F-=E4=BD=93=E6=A3=80=E7=AE=A1=E7=90=86-=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1=EF=BC=9A=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E2=80=98=E5=AF=BC=E5=87=BA=E6=95=99=E8=81=8C=E5=B7=A5=E6=9C=AA?=
 =?UTF-8?q?=E9=80=89=E5=90=8D=E5=8D=95=E2=80=99=E5=BF=BD=E7=95=A5=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AEid=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/HealthCheckupSingleServiceImpl.java          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java b/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java
index 2d8cece..0c4b4c1 100644
--- a/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java
+++ b/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java
@@ -212,6 +212,8 @@ public class HealthCheckupSingleServiceImpl extends ViServiceImpl<HealthCheckupP
                         """);
 //                cnd.and("aus.groupId","=",project.getActivityGroupId());
                 sql.setVar("projectCnd", "AND u.id NOT IN ( SELECT selectUserId FROM `health_checkup_user_selection` WHERE projectId = '" + projectId + "' AND selectUserId IS NOT NULL )");
+                cnd.and("aus.projectId", "=", projectId);
+                cnd.and("u.id", "is not", null);
             }
         }
         if (Strings.isNotBlank(searchName) && Strings.isNotBlank(searchKeyword)) {
@@ -275,6 +277,8 @@ public class HealthCheckupSingleServiceImpl extends ViServiceImpl<HealthCheckupP
                         """);
 //                cnd.and("aus.groupId","=",project.getActivityGroupId());
                 sql.setVar("projectCnd", "AND u.id NOT IN ( SELECT selectUserId FROM `health_checkup_user_selection` WHERE projectId = '" + projectId + "' AND selectUserId IS NOT NULL )");
+                cnd.and("aus.projectId", "=", projectId);
+                cnd.and("u.id", "is not", null);
                 cnd.asc("aus.sort");
             }
         }