From 16ea51a34d333152c26e8442c1d644ae9fe895b6 Mon Sep 17 00:00:00 2001
From: mashuai <mashuai@163.com>
Date: Fri, 8 Dec 2023 13:31:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/zlpt/equip/controller/DevInfoController.java | 1 -
 .../src/main/resources/mapper/BmCarouselSetMapper.xml      | 7 ++++---
 .../src/main/resources/mapper/BmTopicInfoMapper.xml        | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java
index 9050388..49e6013 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java
@@ -26,7 +26,6 @@ import javax.servlet.http.HttpServletResponse;
  * @author xsheng
  * @date 2023-12-02
  */
-@Api(tags = "装备数据接口")
 @RestController
 @RequestMapping("/dev")
 @Api(value = "设备信息",tags = "设备管理")
diff --git a/zlpt-modules/zlpt-home/src/main/resources/mapper/BmCarouselSetMapper.xml b/zlpt-modules/zlpt-home/src/main/resources/mapper/BmCarouselSetMapper.xml
index c47446e..d7c18eb 100644
--- a/zlpt-modules/zlpt-home/src/main/resources/mapper/BmCarouselSetMapper.xml
+++ b/zlpt-modules/zlpt-home/src/main/resources/mapper/BmCarouselSetMapper.xml
@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.bonus.zlpt.home.mapper.BmCarouselSetMapper">
 
     <sql id="selectBmCarouseVo">
-        select id, car_name, car_url, type, open_url, bc.status, bc.create_time, su.user_name AS createBy, sort, is_active
+        select bc.id, bc.car_name, bc.car_url, bc.type, bc.open_url, bc.status, bc.create_time, su.user_name AS createBy, bc.sort, bc.is_active
         from bm_carousel_set bc
         left join sys_user su on bc.creator = su.user_id
     </sql>
@@ -59,12 +59,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 BETWEEN date_format( #{beginTime}, '%Y-%m-%d' )
                 and date_format( #{endTime}, '%Y-%m-%d' )
             </if>
+            and bc.is_active = '1'
         </where>
-        ORDER BY CASE WHEN sort IS NULL THEN 1 ELSE 0 END, sort
+        ORDER BY CASE WHEN bc.sort IS NULL THEN 1 ELSE 0 END, bc.sort
     </select>
 
     <select id="selectListById" resultType="com.bonus.zlpt.home.pojo.BmCarouselSet">
         <include refid="selectBmCarouseVo"/>
-        where id = #{id}
+        where bc.id = #{id} and bc.is_active = '1'
     </select>
 </mapper>
\ No newline at end of file
diff --git a/zlpt-modules/zlpt-home/src/main/resources/mapper/BmTopicInfoMapper.xml b/zlpt-modules/zlpt-home/src/main/resources/mapper/BmTopicInfoMapper.xml
index afcb4bd..bbd5a6b 100644
--- a/zlpt-modules/zlpt-home/src/main/resources/mapper/BmTopicInfoMapper.xml
+++ b/zlpt-modules/zlpt-home/src/main/resources/mapper/BmTopicInfoMapper.xml
@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.bonus.zlpt.home.mapper.BmTopicInfoMapper">
 
     <sql id="selectBmTopicVo">
-        select id, topic_name, type, view_num, content, is_active, su.user_name AS creator, bt.create_time
+        select bt.id, bt.topic_name, bt.type, bt.view_num, bt.content, bt.is_active, su.user_name AS creator, bt.create_time
         from bm_topic_info bt
         left join sys_user su on bt.creator = su.user_id
     </sql>
@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectListById" resultType="com.bonus.zlpt.home.pojo.BmTopicInfo">
         <include refid="selectBmTopicVo"/>
-        where id = #{id}
+        where bt.id = #{id} and bt.is_active = '1'
     </select>
 
     <select id="selectSpecialInfoList" resultType="com.bonus.zlpt.home.pojo.BmTopicInfo">
@@ -69,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 BETWEEN date_format( #{beginTime}, '%Y-%m-%d' )
                 and date_format( #{endTime}, '%Y-%m-%d' )
             </if>
+            and bt.is_active = '1'
         </where>
     </select>
 </mapper>
\ No newline at end of file