From 42b681e26c42a717b68aac1447d633acc8e9616e Mon Sep 17 00:00:00 2001
From: 18356073052 <274131322@qq.com>
Date: Fri, 8 Jan 2021 00:32:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E4=BE=A7=E8=BE=B9=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../linkwechat/web/controller/wecom/WeChatSideController.java | 4 ++--
 .../java/com/linkwechat/wecom/mapper/WeChatSideMapper.java    | 4 ++--
 .../java/com/linkwechat/wecom/service/IWeChatSideService.java | 2 +-
 .../linkwechat/wecom/service/impl/WeChatSideServiceImpl.java  | 4 ++--
 .../src/main/resources/mapper/wecom/WeChatSideMapper.xml      | 4 +++-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatSideController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatSideController.java
index 00c5ac133..0c37fff9f 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatSideController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatSideController.java
@@ -30,9 +30,9 @@ public class WeChatSideController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('chat:side:list')")
     @GetMapping("/list")
-    public TableDataInfo list() {
+    public TableDataInfo list(@RequestParam(value = "h5") String h5) {
         startPage();
-        List<WeChatSide> weChatSides = weChatSideService.chatSides();
+        List<WeChatSide> weChatSides = weChatSideService.chatSides(h5);
         return getDataTable(weChatSides);
     }
 
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatSideMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatSideMapper.java
index 3439594aa..215f48f1a 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatSideMapper.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatSideMapper.java
@@ -15,10 +15,10 @@ public interface WeChatSideMapper extends BaseMapper<WeChatSide> {
 
     /**
      * 查询侧边栏列表
-     *
+     * @param h5 0 pc 1 h5
      * @return {@link WeChatSide}s
      */
-    public List<WeChatSide> selectWeChatSides();
+    public List<WeChatSide> selectWeChatSides(@Param("h5") String h5);
 
 
     /**
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatSideService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatSideService.java
index 03062de2a..5bbf2ab62 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatSideService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatSideService.java
@@ -16,7 +16,7 @@ public interface IWeChatSideService extends IService<WeChatSide> {
      *
      * @return {@link WeChatSide}s
      */
-    public List<WeChatSide> chatSides();
+    public List<WeChatSide> chatSides(String h5);
 
     /**
      * 更新侧边栏信息
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatSideServiceImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatSideServiceImpl.java
index 929b29f96..0bdc801c3 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatSideServiceImpl.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatSideServiceImpl.java
@@ -21,8 +21,8 @@ public class WeChatSideServiceImpl extends ServiceImpl<WeChatSideMapper, WeChatS
     private WeChatSideMapper weChatSideMapper;
 
     @Override
-    public List<WeChatSide> chatSides() {
-        return weChatSideMapper.selectWeChatSides();
+    public List<WeChatSide> chatSides(String h5) {
+        return weChatSideMapper.selectWeChatSides(h5);
     }
 
     @Override
diff --git a/linkwe-wecom/src/main/resources/mapper/wecom/WeChatSideMapper.xml b/linkwe-wecom/src/main/resources/mapper/wecom/WeChatSideMapper.xml
index ce8f9e164..fda2f915e 100644
--- a/linkwe-wecom/src/main/resources/mapper/wecom/WeChatSideMapper.xml
+++ b/linkwe-wecom/src/main/resources/mapper/wecom/WeChatSideMapper.xml
@@ -31,7 +31,9 @@
         FROM
             we_chat_side
         <where>
-            `using`=0
+                <if test="h5!=null and h5!='' and h5=='1'.toString()">
+                    `using`=0
+                </if>
         </where>
     </select>
 
-- 
Gitee