revert(watch): 还原listByWatch绑定过滤改动,恢复仅排序逻辑

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
wanghao
2026-09-07 15:50:32 +08:00
co-authored by Claude
parent d47737de5e
commit 570ed10c33
2 changed files with 1 additions and 8 deletions
@@ -313,12 +313,6 @@
<if test="filter.phone != null and filter.phone != ''"> <if test="filter.phone != null and filter.phone != ''">
and b.phone like CONCAT(#{filter.phone,jdbcType=VARCHAR}, '%') and b.phone like CONCAT(#{filter.phone,jdbcType=VARCHAR}, '%')
</if> </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> </where>
<choose> <choose>
<when test="filter.idList != null and !filter.idList.isEmpty()"> <when test="filter.idList != null and !filter.idList.isEmpty()">
@@ -786,8 +786,7 @@ public class HealthUserEmployeeExServiceImpl extends ServiceImpl<HealthUserEmplo
} }
List<String> bindUserIdList = watchApi.getBindUserIdList(); List<String> bindUserIdList = watchApi.getBindUserIdList();
if (!CollectionUtils.isEmpty(bindUserIdList)) { if (!CollectionUtils.isEmpty(bindUserIdList)) {
// 排除已绑定手表的用户,只展示未绑定用户 filter.setIdList(bindUserIdList);
filter.setExcludeUserIds(bindUserIdList);
} }
IPage<UserEmployee> userEmployeeIPage = healthUserEmployeeExMapper.selectUserListByWatch(page, filter); IPage<UserEmployee> userEmployeeIPage = healthUserEmployeeExMapper.selectUserListByWatch(page, filter);
if (CollectionUtils.isEmpty(userEmployeeIPage.getRecords())) { if (CollectionUtils.isEmpty(userEmployeeIPage.getRecords())) {