Merge remote-tracking branch 'origin/xc' into xc

Co-Authored-By: Claude <noreply@anthropic.com>

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

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