料塔余量修改6

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/service/impl/FeedingFatServiceImpl.java

@@ -288,8 +288,10 @@ public class FeedingFatServiceImpl extends ServiceImpl<FeedingFatMapper, Feeding
 
         FeedingFatMoveVo2 vo2 = new FeedingFatMoveVo2();
         QueryWrapper<FeedingFat> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("org_id", fatMove2Param.getOrgId()).in("unit_id", idList)
-                .ge("upload_time", timesmorning);
+        queryWrapper.eq("org_id", fatMove2Param.getOrgId()).ge("upload_time", timesmorning);
+        if (idList.size() > 0) {
+            queryWrapper.in("unit_id", idList);
+        }
         if ("1".equals(fatMove2Param.getType())) {
             FeedingFatMoveVo feedingFatMoveVo = fatMapper.listFatMove(queryWrapper);//今日采食和饮水
             List<FeedingFatVo2> list = fatMapper.listFeeding(queryWrapper);//采食
@@ -305,8 +307,10 @@ public class FeedingFatServiceImpl extends ServiceImpl<FeedingFatMapper, Feeding
             FeedingFatMoveVo feedingFatMoveVo = fatMapper.listFatMove(queryWrapper);//今日采食和饮水
             Date monthmorning = DataUill.getTimesMonthmorning();
             QueryWrapper<FeedingFat> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("org_id", fatMove2Param.getOrgId()).in("unit_id", idList)
-                    .ge("upload_time", monthmorning);
+            queryWrapper1.eq("org_id", fatMove2Param.getOrgId()).ge("upload_time", monthmorning);
+            if (idList.size() > 0) {
+                queryWrapper1.in("unit_id", idList);
+            }
             List<FeedingFatVo2> list = fatMapper.listMonthFeeding(queryWrapper1);
             List<FeedingFatVo2> list1 = fatMapper.listMonthWater(queryWrapper1);
             List<FeedingFatVo2> list2 = fatMapper.listMonthweigth(queryWrapper1);