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())) {