From 25df5530b89fc57a3f32a0e4c706bb40d3e4b415 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 15 Nov 2023 17:27:58 +0800
Subject: [PATCH] 标签控制+通知详情优化

---
 src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml b/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml
index 63de322..aae1343 100644
--- a/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml
@@ -47,14 +47,34 @@
     <select id="selectHouseLabelPage" resultMap="UserHouseLabelDTOResult">
         <include refid="selectUserHouseLabel"/>
         <where>
-            <if test="houseLabel.id != null "> and id = #{houseLabel.id}</if>
-            <if test="houseLabel.houseCode != null  and houseLabel.houseCode != ''"> and house_code = #{houseLabel.houseCode}</if>
-            <if test="houseLabel.labelId != null "> and label_id = #{houseLabel.labelId}</if>
-            <if test="houseLabel.labelName != null  and houseLabel.labelName != ''"> and label_name = #{houseLabel.labelName}</if>
-            <if test="houseLabel.color != null  and houseLabel.color != ''"> and color = #{houseLabel.color}</if>
-            <if test="houseLabel.remark != null  and remark != ''"> and remark = #{houseLabel.remark}</if>
-            <if test="houseLabel.userId != null "> and user_id = #{houseLabel.userId}</if>
-            <if test="houseLabel.lableType != null "> and lable_type = #{houseLabel.lableType}</if>
+            <if test="houseLabel.id != null ">and id = #{houseLabel.id}</if>
+            <if test="houseLabel.houseCode != null  and houseLabel.houseCode != ''">and house_code =
+                #{houseLabel.houseCode}
+            </if>
+            <if test="houseLabel.labelId != null ">and label_id = #{houseLabel.labelId}</if>
+            <if test="houseLabel.labelName != null  and houseLabel.labelName != ''">and label_name =
+                #{houseLabel.labelName}
+            </if>
+            <if test="houseLabel.color != null  and houseLabel.color != ''">and color = #{houseLabel.color}</if>
+            <if test="houseLabel.remark != null  and remark != ''">and remark = #{houseLabel.remark}</if>
+            <if test="houseLabel.userId != null ">and user_id = #{houseLabel.userId}</if>
+            <if test="houseLabel.lableType != null ">and lable_type = #{houseLabel.lableType}</if>
+        </where>
+    </select>
+
+
+    <select id="getUserLabelList" resultType="java.lang.Integer"  parameterType="org.springblade.modules.house.dto.UserHouseLabelDTO">
+        select label_id
+        from jczz_user_house_label
+        <where>
+            <if test="id != null "> and id = #{id}</if>
+            <if test="houseCode != null  and houseCode != ''"> and house_code = #{houseCode}</if>
+            <if test="labelId != null "> and label_id = #{labelId}</if>
+            <if test="labelName != null  and labelName != ''"> and label_name = #{labelName}</if>
+            <if test="color != null  and color != ''"> and color = #{color}</if>
+            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="lableType != null "> and lable_type = #{lableType}</if>
         </where>
     </select>
 

--
Gitblit v1.9.3