用户端新闻资讯公告取消城市筛选

pz-applet/src/main/java/com/pz/applet/AppletInformationController.java

@@ -45,7 +45,7 @@ public class AppletInformationController extends BaseController {
      */
      */
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo<InformationVo> list(InformationBo bo, PageQuery pageQuery, HttpServletRequest reques) {
     public TableDataInfo<InformationVo> list(InformationBo bo, PageQuery pageQuery, HttpServletRequest reques) {
-        bo.setCityId(CityIdUtils.setCityIdPasLong(reques));
+        //bo.setCityId(CityIdUtils.setCityIdPasLong(reques));
         return iInformationService.queryPageList(bo, pageQuery);
         return iInformationService.queryPageList(bo, pageQuery);
     }
     }
 
 

pz-system/src/main/java/com/pz/system/service/impl/CarouselServiceImpl.java

@@ -134,10 +134,15 @@ public class CarouselServiceImpl implements ICarouselService {
     public HomeVo selectHome(Integer cityId) {
     public HomeVo selectHome(Integer cityId) {
         HomeVo homeVo = new HomeVo();
         HomeVo homeVo = new HomeVo();
         List<Notice> notices = noticeMapper.selectList(
         List<Notice> notices = noticeMapper.selectList(
-            new LambdaQueryWrapper<Notice>().eq(Notice::getSite,1).eq(Notice::getCityId,cityId)
+            new LambdaQueryWrapper<Notice>().eq(Notice::getSite,1)
         );
         );
         if(null != notices && notices.size() != 0){
         if(null != notices && notices.size() != 0){
-            homeVo.setNotice(notices.get(0).getInfo());
+            StringBuilder stringBuilder = new StringBuilder();
+            for (Notice notice : notices) {
+                stringBuilder.append(notice.getInfo());
+                stringBuilder.append("         ");
+            }
+            homeVo.setNotice(stringBuilder.toString());
         }
         }
         homeVo.setCarousel(baseMapper.selectList(
         homeVo.setCarousel(baseMapper.selectList(
             new LambdaQueryWrapper<Carousel>().eq(
             new LambdaQueryWrapper<Carousel>().eq(