bug修改

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvRegularCallEggServiceImpl.java

@@ -265,19 +265,21 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
         } else {
             QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(duckNum), "chi_num", duckNum).eq("is_cage", 0);
-            BaseDuckInfo baseDuckInfo = infoMapper.selectOne(queryWrapper);//笼子里的鸭只信息
-            if (ObjectUtil.isNotEmpty(baseDuckInfo)) {
+            List<BaseDuckInfo> baseDuckInfos = infoMapper.selectList(queryWrapper);//笼子里的鸭只信息
+            if (baseDuckInfos.size() > 0) {
                 List<Integer> idLists = new ArrayList<>();
-                idLists.add(baseDuckInfo.getUnitId());
+                baseDuckInfos.forEach(item->{
+                    idLists.add(item.getId());
+                });
                 List<FeedingAndEggVo> oneFeedAndEgg = eggMapper.getOneFeedAndEgg(farmId, idLists);
                 JSONObject jsonObject = new JSONObject();
                 if (oneFeedAndEgg.size() > 0) {
                     for (FeedingAndEggVo feedingAndEggVo : oneFeedAndEgg) {
                         jsonObject.put("egg", feedingAndEggVo.getEggNum());
                         jsonObject.put("feed", feedingAndEggVo.getDuckWeight());
-                        jsonObject.put("duckNum", baseDuckInfo.getDuckNum());
-                        jsonObject.put("chiNum", baseDuckInfo.getChiNum());
-                        jsonObject.put("location", baseDuckInfo.getUnitName());
+                        jsonObject.put("duckNum", feedingAndEggVo.getDuckNum());
+                        jsonObject.put("chiNum", feedingAndEggVo.getChiNum());
+                        jsonObject.put("location", feedingAndEggVo.getUnitName());
                         jsonArray.add(jsonObject);
                     }
                 }