From 570ed10c335f89aed76f51d43c6eba133e1feec3 Mon Sep 17 00:00:00 2001 From: wanghao Date: Mon, 7 Sep 2026 15:50:32 +0800 Subject: [PATCH] =?UTF-8?q?revert(watch):=20=E8=BF=98=E5=8E=9FlistByWatch?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E8=BF=87=E6=BB=A4=E6=94=B9=E5=8A=A8=EF=BC=8C?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=BB=85=E6=8E=92=E5=BA=8F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude --- .../system/mapper/xml/HealthUserEmployeeExMapper.xml | 6 ------ .../service/impl/HealthUserEmployeeExServiceImpl.java | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) 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 0668556..4085c98 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,12 +313,6 @@ and b.phone like CONCAT(#{filter.phone,jdbcType=VARCHAR}, '%') - - AND a.id not in - - #{item} - - 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 47b470d..7948cf2 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,8 +786,7 @@ public class HealthUserEmployeeExServiceImpl extends ServiceImpl bindUserIdList = watchApi.getBindUserIdList(); if (!CollectionUtils.isEmpty(bindUserIdList)) { - // 排除已绑定手表的用户,只展示未绑定用户 - filter.setExcludeUserIds(bindUserIdList); + filter.setIdList(bindUserIdList); } IPage userEmployeeIPage = healthUserEmployeeExMapper.selectUserListByWatch(page, filter); if (CollectionUtils.isEmpty(userEmployeeIPage.getRecords())) {