城市列表修复

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

@@ -50,7 +50,7 @@ public class AppletArticleController extends BaseController {
      */
      */
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo<ArticleVo> list(ArticleBo bo, PageQuery pageQuery, HttpServletRequest reques) {
     public TableDataInfo<ArticleVo> list(ArticleBo bo, PageQuery pageQuery, HttpServletRequest reques) {
-        bo.setCityId(CityIdUtils.setCityIdPasInteger(reques));
+        //bo.setCityId(CityIdUtils.setCityIdPasInteger(reques));
         return iArticleService.queryPageListByApp(bo, pageQuery);
         return iArticleService.queryPageListByApp(bo, pageQuery);
     }
     }
 
 

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

+package com.pz.applet;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.pz.common.annotation.Log;
+import com.pz.common.annotation.RepeatSubmit;
+import com.pz.common.core.controller.BaseController;
+import com.pz.common.core.domain.PageQuery;
+import com.pz.common.core.domain.R;
+import com.pz.common.core.page.TableDataInfo;
+import com.pz.common.core.validate.AddGroup;
+import com.pz.common.core.validate.EditGroup;
+import com.pz.common.enums.BusinessType;
+import com.pz.common.utils.poi.ExcelUtil;
+import com.pz.system.domain.bo.NoticeBo;
+import com.pz.system.domain.vo.NoticeVo;
+import com.pz.system.service.INoticeService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 公告
+ *
+ * @author ruoyi
+ * @date 2023-09-07
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/applet/notices")
+public class AppletNoticeController extends BaseController {
+
+    private final INoticeService iNoticeService;
+
+    /**
+     * 查询公告列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<NoticeVo> list(NoticeBo bo, PageQuery pageQuery) {
+        return iNoticeService.queryPageList(bo, pageQuery);
+    }
+
+}

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

@@ -51,10 +51,10 @@ public class ServicesServiceImpl implements IServicesService {
     public TableDataInfo<ServicesVo> queryPageList(ServicesBo bo, PageQuery pageQuery) {
     public TableDataInfo<ServicesVo> queryPageList(ServicesBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<Services> lqw = buildQueryWrapper(bo);
         LambdaQueryWrapper<Services> lqw = buildQueryWrapper(bo);
         Page<ServicesVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         Page<ServicesVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        result.getRecords().stream().findFirst().ifPresent(service -> {
+        /*result.getRecords().stream().findFirst().ifPresent(service -> {
             noticeMapper.selectList(new LambdaQueryWrapper<Notice>().eq(Notice::getSite, 2))
             noticeMapper.selectList(new LambdaQueryWrapper<Notice>().eq(Notice::getSite, 2))
                 .stream().findFirst().ifPresent(notices -> service.setNotice(notices.getInfo()));
                 .stream().findFirst().ifPresent(notices -> service.setNotice(notices.getInfo()));
-        });
+        });*/
         return TableDataInfo.build(result);
         return TableDataInfo.build(result);
     }
     }