From f425a4523a844a71ed9b1acf74b94e94d0886a0f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 29 十一月 2023 14:06:22 +0800
Subject: [PATCH] 修改金汇办事指南线上线下问题

---
 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiComActWorkGuideDAO.java                  |    3 ++-
 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiComActWorkGuideServiceImpl.java |    4 ++--
 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMapper.xml                                               |   10 +++++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiComActWorkGuideDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiComActWorkGuideDAO.java
index 244fb21..0c0ec21 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiComActWorkGuideDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiComActWorkGuideDAO.java
@@ -28,7 +28,8 @@
      * @return  办事指南列表
      */
     List<ComActWorkGuideDetailAppletsVO> getWorkGuideListByClassifyId(@Param("classifyId") String classifyId,
-                                                                      @Param("pageSize") String pageSize);
+                                                                      @Param("pageSize") String pageSize,
+                                                                      @Param("isOnLine") String isOnLine);
 
 
 
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiComActWorkGuideServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiComActWorkGuideServiceImpl.java
index 6fe83c3..289da2e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiComActWorkGuideServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiComActWorkGuideServiceImpl.java
@@ -307,7 +307,7 @@
         //通过办事指南分类查询分类下办事指南
         workGuideClassifyList.forEach(workGuideClassify -> {
             List<ComActWorkGuideDetailAppletsVO> workGuideList =
-                    this.baseMapper.getWorkGuideListByClassifyId(workGuideClassify.getId()+"","10");
+                    this.baseMapper.getWorkGuideListByClassifyId(workGuideClassify.getId()+"","10",pageActWorkGuideDTO.getIsOnLine());
             if(workGuideList != null && workGuideList.size() > 0){
                 workGuideClassify.setGuideDetailList(workGuideList);
                 //分类下办事指南数据大于0加入到结果集中向小程序展示
@@ -324,6 +324,6 @@
      */
     @Override
     public R listWorkGuideByClassifyId(String classifyId){
-        return R.ok(this.baseMapper.getWorkGuideListByClassifyId(classifyId,null));
+        return R.ok(this.baseMapper.getWorkGuideListByClassifyId(classifyId,null,null));
     }
 }
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMapper.xml
index 618f07c..c39add2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMapper.xml
@@ -77,7 +77,15 @@
             is_on_line,
             community_id
         from jinhui_com_act_work_guide
-        where classify = #{classifyId}
+        <where>
+            1=1
+            <if test="classifyId != null and classifyId!='' ">
+                and classify = #{classifyId}
+            </if>
+            <if test='isOnLine != null and isOnLine != &quot;&quot;'>
+                and is_on_line=#{pageActWorkGuideDTO.isOnLine}
+            </if>
+        </where>
         order by create_at desc
         <if test="pageSize != null">
             limit ${pageSize}

--
Gitblit v1.7.1