修改大事件和园地

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyEventsServiceImpl.java

@@ -44,23 +44,26 @@ public class TbFamilyEventsServiceImpl extends ServiceImpl<TbFamilyEventsMapper,
             item.setFamily(family);
         });
 
-        List<Long> ids = new ArrayList<>();
-        list.forEach(item -> {
-            ids.add(item.getId());
-        });
-        List<TbEventsImg> imgList = eventsImgService.list(new LambdaQueryWrapper<TbEventsImg>()
-                .in(TbEventsImg::getEventsId, ids)
-        );
-        list.forEach(item -> {
-            // 加入图片列表
-            List<TbEventsImg> imgs = new ArrayList<>();
-            imgList.forEach(img -> {
-                if (img.getEventsId().equals(item.getId())) {
-                    imgs.add(img);
-                }
+        if (entity.getId() != null){
+            List<Long> ids = new ArrayList<>();
+            list.forEach(item -> {
+                ids.add(item.getId());
             });
-            item.setImgList(imgs);
-        });
+            List<TbEventsImg> imgList = eventsImgService.list(new LambdaQueryWrapper<TbEventsImg>()
+                    .in(TbEventsImg::getEventsId, ids)
+            );
+            list.forEach(item -> {
+                // 加入图片列表
+                List<TbEventsImg> imgs = new ArrayList<>();
+                imgList.forEach(img -> {
+                    if (img.getEventsId().equals(item.getId())) {
+                        imgs.add(img);
+                    }
+                });
+                item.setImgList(imgs);
+            });
+        }
+
 
         return list;
     }

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyGardenServiceImpl.java

@@ -43,23 +43,27 @@ public class TbFamilyGardenServiceImpl extends ServiceImpl<TbFamilyGardenMapper,
             item.setFamily(family);
         });
 
-        List<Long> ids = new ArrayList<>();
-        list.forEach(item -> {
-            ids.add(item.getId());
-        });
-        List<TbGardenImg> imgList = gardenImgService.list(new LambdaQueryWrapper<TbGardenImg>()
-                .in(TbGardenImg::getGardenId, ids)
-        );
-        list.forEach(item -> {
-            // 加入图片列表
-            List<TbGardenImg> imgs = new ArrayList<>();
-            imgList.forEach(img -> {
-                if (img.getGardenId().equals(item.getId())) {
-                    imgs.add(img);
-                }
+        if(entity.getId() != null)
+        {
+            List<Long> ids = new ArrayList<>();
+            list.forEach(item -> {
+                ids.add(item.getId());
             });
-            item.setImgList(imgs);
-        });
+            List<TbGardenImg> imgList = gardenImgService.list(new LambdaQueryWrapper<TbGardenImg>()
+                    .in(TbGardenImg::getGardenId, ids)
+            );
+            list.forEach(item -> {
+                // 加入图片列表
+                List<TbGardenImg> imgs = new ArrayList<>();
+                imgList.forEach(img -> {
+                    if (img.getGardenId().equals(item.getId())) {
+                        imgs.add(img);
+                    }
+                });
+                item.setImgList(imgs);
+            });
+
+        }
 
         return list;
     }