数据查询过滤用户id为空的数据

health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java

@@ -1228,6 +1228,7 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
         baseWrapper.selectMax(WatchDataHeartRate::getDataValue,BigScreenVo::getMaxData);
         baseWrapper.ge(WatchDataHeartRate::getDataDate,startDate);
         baseWrapper.le(WatchDataHeartRate::getDataDate,endDate);
+        baseWrapper.isNotNull(WatchDataHeartRate::getBindUserId);
         if(StrUtil.isNotEmpty(orgCode)){
             //目前的表结构不支持部门的筛选 ,要支持需要嵌套日汇总表的子查询
             baseWrapper.in(WatchDataHeartRate::getBindUserId,WatchStatUserInfoDayHeartRate.class,
@@ -1254,6 +1255,7 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
         wrapper.selectCount(WatchDataSpo2::getId,BigScreenVo::getTotalSum);
         wrapper.ge(WatchDataSpo2::getDataDate,startDate);
         wrapper.le(WatchDataSpo2::getDataDate,endDate);
+        wrapper.isNotNull(WatchDataSpo2::getBindUserId);
         if(StrUtil.isNotEmpty(orgCode)){
             //目前的表结构不支持部门的筛选 ,要支持需要嵌套日汇总表的子查询
             wrapper.in(WatchDataSpo2::getBindUserId,WatchStatUserInfoDaySpo2.class,
@@ -1283,6 +1285,7 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
         wrapper.selectCount(WatchDataStress::getId,BigScreenVo::getTotalSum);
         wrapper.ge(WatchDataStress::getDataDate,startDate);
         wrapper.le(WatchDataStress::getDataDate,endDate);
+        wrapper.isNotNull(WatchDataStress::getBindUserId);
         if(StrUtil.isNotEmpty(orgCode)){
             //目前的表结构不支持部门的筛选 ,要支持需要嵌套日汇总表的子查询
             wrapper.in(WatchDataStress::getBindUserId,WatchStatUserInfoDayStress.class,
@@ -1310,6 +1313,7 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
         wrapper.selectCount(WatchDataTemperature::getId,BigScreenVo::getTotalSum);
         wrapper.ge(WatchDataTemperature::getDataDate,startDate);
         wrapper.le(WatchDataTemperature::getDataDate,endDate);
+        wrapper.isNotNull(WatchDataTemperature::getBindUserId);
         if(StrUtil.isNotEmpty(orgCode)){
             //目前的表结构不支持部门的筛选 ,要支持需要嵌套日汇总表的子查询
             wrapper.in(WatchDataTemperature::getBindUserId,WatchStatUserInfoDayTemp.class,
@@ -1502,6 +1506,7 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
         baseWrapper.ge(ObjectUtil.isNotNull(startTime),WatchDataTemperature::getDataDate,startTime);
         baseWrapper.le(ObjectUtil.isNotNull(endTime),WatchDataTemperature::getDataDate,endTime);
         baseWrapper.in(ObjectUtil.isNotNull(userIds),WatchDataTemperature::getBindUserId,userIds);
+        baseWrapper.isNotNull(WatchDataTemperature::getBindUserId);
         //目前的表结构不支持部门的筛选 ,要支持需要嵌套日汇总表的子查询
         if(StrUtil.isNotEmpty(orgCode)){
             baseWrapper.in(WatchDataTemperature::getBindUserId,WatchStatUserInfoDayTemp.class,
@@ -1540,6 +1545,7 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
         baseWrapper.ge(ObjectUtil.isNotNull(startTime),WatchDataStress::getDataDate,startTime);
         baseWrapper.le(ObjectUtil.isNotNull(endTime),WatchDataStress::getDataDate,endTime);
         baseWrapper.in(ObjectUtil.isNotNull(userIds),WatchDataStress::getBindUserId,userIds);
+        baseWrapper.isNotNull(WatchDataStress::getBindUserId);
         //目前的表结构不支持部门的筛选 ,要支持需要嵌套日汇总表的子查询
         if(StrUtil.isNotEmpty(orgCode)){
             baseWrapper.in(WatchDataStress::getBindUserId,WatchStatUserInfoDayStress.class,
@@ -1582,6 +1588,7 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
         baseWrapper.ge(ObjectUtil.isNotNull(startTime),WatchDataSpo2::getDataDate,startTime);
         baseWrapper.le(ObjectUtil.isNotNull(endTime),WatchDataSpo2::getDataDate,endTime);
         baseWrapper.in(ObjectUtil.isNotNull(userIds),WatchDataSpo2::getBindUserId,userIds);
+        baseWrapper.isNotNull(WatchDataSpo2::getBindUserId);
         //目前的表结构不支持部门的筛选 ,要支持需要嵌套日汇总表的子查询
         if(StrUtil.isNotEmpty(orgCode)){
             baseWrapper.in(WatchDataSpo2::getBindUserId,WatchStatUserInfoDaySpo2.class,
@@ -1609,6 +1616,7 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
         baseWrapper.ge(ObjectUtil.isNotNull(startTime),WatchDataHeartRate::getDataDate,startTime);
         baseWrapper.le(ObjectUtil.isNotNull(endTime),WatchDataHeartRate::getDataDate,endTime);
         baseWrapper.in(ObjectUtil.isNotNull(userIds),WatchDataHeartRate::getBindUserId,userIds);
+        baseWrapper.isNotNull(WatchDataHeartRate::getBindUserId);
         //目前的表结构不支持部门的筛选 ,要支持需要嵌套日汇总表的子查询
         if(StrUtil.isNotEmpty(orgCode)){
             baseWrapper.in(WatchDataHeartRate::getBindUserId,WatchStatUserInfoDayHeartRate.class,