From 18087f533cd48ddb9f972c0848ffe920ec58ee8e Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 26 九月 2022 16:01:14 +0800
Subject: [PATCH] 修改打包和app

---
 src/main/java/com/boying/controller/phone/NoticeController.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/boying/controller/phone/NoticeController.java b/src/main/java/com/boying/controller/phone/NoticeController.java
index 052713c..e986a71 100644
--- a/src/main/java/com/boying/controller/phone/NoticeController.java
+++ b/src/main/java/com/boying/controller/phone/NoticeController.java
@@ -64,7 +64,7 @@
         };
         List<EnterPark> all = enterParkService.findAll(specification2);
         for(EnterPark enterPark:all){
-            Park park = (Park) parkService.findById(enterPark.getId());
+            Park park = (Park) parkService.findById(enterPark.getParkId());
             enterPark.setParkName(park.getName());
         }
         return success("",all);
@@ -88,6 +88,12 @@
             }
         };
         Page<EnterPark> all = enterParkService.findPage(pageable,specification2);
+        for (EnterPark enterPark : all.getContent()) {
+            Park byId = (Park)parkService.findById(enterPark.getParkId());
+            if(byId != null){
+                enterPark.setParkName(byId.getName());
+            }
+        }
         return success("",all);
     }
 }

--
Gitblit v1.9.1