Merge branch 'dev' into fix_sleep

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java

@@ -320,7 +320,10 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
 
 
         List<PlatElderChildrenInfo> allChildInfoList = new ArrayList<>();
         List<PlatElderChildrenInfo> allChildInfoList = new ArrayList<>();
         //通知每个长者的子女
         //通知每个长者的子女
-        List<PlatElderChildrenInfo> childrenInfoList = platElderChildrenInfoMapper.list(alarmConfig.getTenantId(), elderIds);
+        LambdaQueryWrapper<PlatElderChildrenInfo> childrenInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        childrenInfoLambdaQueryWrapper.eq(BaseBusEntity::getTenantId, alarmConfig.getTenantId());
+        childrenInfoLambdaQueryWrapper.and(qw -> qw.apply("find_in_set('" + elderIds + "',elder_id)"));
+        List<PlatElderChildrenInfo> childrenInfoList = platElderChildrenInfoService.list(childrenInfoLambdaQueryWrapper);
         if (CollectionUtils.isEmpty(childrenInfoList)) {
         if (CollectionUtils.isEmpty(childrenInfoList)) {
             throw new BusinessException("子女端账号未绑定长者,长者id:" + elderIds);
             throw new BusinessException("子女端账号未绑定长者,长者id:" + elderIds);
         }
         }

server-service/src/main/resources/mappers/PlatElderChildrenInfoMapper.xml

@@ -10,6 +10,7 @@
         from plat_elder_children_info
         from plat_elder_children_info
         where tenant_id = #{tenantId}
         where tenant_id = #{tenantId}
           and find_in_set(#{elderIds},elder_id)
           and find_in_set(#{elderIds},elder_id)
+          and del_flag = '0'
     </select>
     </select>
 
 
 </mapper>
 </mapper>