From e33b364d475618b2b99c48c477fb5d654df5cca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Sat, 13 Jul 2024 14:18:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=8E=86=E5=8F=B2=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sqx/modules/bl/collect/entity/CollectMassage.java | 2 ++
 src/main/resources/mapper/bl/collect/CollectMassageDao.xml     | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/sqx/modules/bl/collect/entity/CollectMassage.java b/src/main/java/com/sqx/modules/bl/collect/entity/CollectMassage.java
index e769ab7..32f0a36 100644
--- a/src/main/java/com/sqx/modules/bl/collect/entity/CollectMassage.java
+++ b/src/main/java/com/sqx/modules/bl/collect/entity/CollectMassage.java
@@ -74,6 +74,8 @@ public class CollectMassage implements Serializable {
     private Integer type;
     @TableField(exist = false)
     private String remarks;
+    @TableField(exist = false)
+    private String labels;
     /**
      * 服务分类ID
      */
diff --git a/src/main/resources/mapper/bl/collect/CollectMassageDao.xml b/src/main/resources/mapper/bl/collect/CollectMassageDao.xml
index e7faca2..cf208db 100644
--- a/src/main/resources/mapper/bl/collect/CollectMassageDao.xml
+++ b/src/main/resources/mapper/bl/collect/CollectMassageDao.xml
@@ -18,7 +18,8 @@
             else replace(c.labels,',',' ')
             end) as remarks,
             (case when a.flag = 1 then b.classify_id else c.classify_id end) as classify_id,
-            (case when a.flag = 1 then x.value else y.value end) as classify_name
+            (case when a.flag = 1 then x.value else y.value end) as classify_name,
+            ifnull(b.labels,'') as labels
         from bl_collect_massage a
         left join massage_type b on a.project_id = b.massage_type_id
         left join bl_massage_package c on a.project_id = c.id