From da026a34bcc97b2eb49607a3b02d94d8f683f997 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:18:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml b/smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml
index 7d8f875..b29cd48 100644
--- a/smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml
@@ -39,6 +39,7 @@
<result property="otherdata" column="otherdata"/>
<result property="richText" column="rich_text"/>
<result property="hetype" column="hetype"/>
+ <result property="watchCount" column="watch_count"/>
<result property="htmlRichText" column="html_rich_text"/>
</resultMap>
@@ -46,6 +47,7 @@
select id,
classification,
hetype,
+ watch_count,
html_rich_text,
assortid,
preachname,
@@ -83,8 +85,8 @@
<select id="selectHeLibraryList" parameterType="com.smartor.domain.HeLibrary" resultMap="HeLibraryResult">
<include refid="selectHeLibraryVo"/>
- <where>
- del_flag=0
+ where 1=1
+ and del_flag = 0
<if test="id != null ">and id = #{id}</if>
<if test="classification != null and classification != ''">and classification = #{classification}</if>
<if test="assortid != null ">and assortid = #{assortid}</if>
@@ -108,6 +110,7 @@
</if>
<if test="pid != null ">and pid = #{pid}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
+ <if test="watchCount != null ">and watch_count = #{watchCount}</if>
<if test="parameter != null and parameter != ''">and parameter = #{parameter}</if>
<if test="isavailable != null and isavailable != ''">and isavailable = #{isavailable}</if>
<if test="suitdisease != null and suitdisease != ''">and suitdisease = #{suitdisease}</if>
@@ -118,7 +121,6 @@
<if test="richText != null and richText != ''">and rich_text = #{richText}</if>
<if test="hetype != null and hetype != ''">and hetype = #{hetype}</if>
<if test="htmlRichText != null and htmlRichText != ''">and html_rich_text = #{htmlRichText}</if>
- </where>
</select>
<select id="selectHeLibraryById" parameterType="Long" resultMap="HeLibraryResult">
@@ -162,6 +164,7 @@
<if test="otherdata != null">otherdata,</if>
<if test="richText != null and richText != ''">rich_text,</if>
<if test="hetype != null and hetype != ''">hetype,</if>
+ <if test="watchCount != null">watch_count,</if>
<if test="htmlRichText != null and htmlRichText != ''">html_rich_text,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -198,6 +201,7 @@
<if test="otherdata != null">#{otherdata},</if>
<if test="richText != null and richText != ''">#{richText},</if>
<if test="hetype != null and hetype != ''">#{hetype},</if>
+ <if test="watchCount != null">#{watchCount},</if>
<if test="htmlRichText != null and htmlRichText != ''">#{htmlRichText},</if>
</trim>
</insert>
@@ -239,6 +243,7 @@
<if test="richText != null and richText != ''">rich_text = #{richText},</if>
<if test="hetype != null and hetype != ''">hetype = #{hetype},</if>
<if test="htmlRichText != null and htmlRichText != ''">html_rich_text = #{htmlRichText},</if>
+ <if test="watchCount != null">watch_count=#{watchCount},</if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3