From 991dbabe8a36ca6d8d51d2aa95fdd10e858974cd Mon Sep 17 00:00:00 2001
From: wanghao <w0401@foxmail.com>
Date: Mon, 7 Sep 2026 15:34:40 +0800
Subject: [PATCH] =?UTF-8?q?fix(watch):=20listByWatch=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=8F=AA=E5=B1=95=E7=A4=BA=E6=9C=AA=E7=BB=91=E5=AE=9A=E6=89=8B?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../system/mapper/xml/HealthUserEmployeeExMapper.xml        | 6 ++++++
 .../service/impl/HealthUserEmployeeExServiceImpl.java       | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserEmployeeExMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserEmployeeExMapper.xml
index 4085c98..0668556 100644
--- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserEmployeeExMapper.xml
+++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserEmployeeExMapper.xml
@@ -313,6 +313,12 @@
             <if test="filter.phone != null and filter.phone != ''">
                 and b.phone like CONCAT(#{filter.phone,jdbcType=VARCHAR}, '%')
             </if>
+            <if test="filter.excludeUserIds != null and filter.excludeUserIds.size()!=0">
+                AND a.id not in
+                <foreach collection="filter.excludeUserIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         <choose>
             <when test="filter.idList != null and !filter.idList.isEmpty()">
diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/HealthUserEmployeeExServiceImpl.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/HealthUserEmployeeExServiceImpl.java
index 7948cf2..47b470d 100644
--- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/HealthUserEmployeeExServiceImpl.java
+++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/HealthUserEmployeeExServiceImpl.java
@@ -786,7 +786,8 @@ public class HealthUserEmployeeExServiceImpl extends ServiceImpl<HealthUserEmplo
         }
         List<String> bindUserIdList = watchApi.getBindUserIdList();
         if (!CollectionUtils.isEmpty(bindUserIdList)) {
-            filter.setIdList(bindUserIdList);
+            // 排除已绑定手表的用户，只展示未绑定用户
+            filter.setExcludeUserIds(bindUserIdList);
         }
         IPage<UserEmployee> userEmployeeIPage = healthUserEmployeeExMapper.selectUserListByWatch(page, filter);
         if (CollectionUtils.isEmpty(userEmployeeIPage.getRecords())) {