From 0d10fc187bde50092ab2e8a6aa7eddb4b673284f Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Mon, 15 Jul 2024 15:51:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8B=93=E5=B1=95=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B7=A5=E5=85=B7=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/qs/serve/common/model/tag/TagFiledUtil.java  | 4 ++--
 .../java/com/qs/serve/modules/tag/entity/so/TagQuery.java | 2 +-
 src/main/resources/mapper/tag/TagDataMapper.xml           | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/qs/serve/common/model/tag/TagFiledUtil.java b/src/main/java/com/qs/serve/common/model/tag/TagFiledUtil.java
index b8d9434f..2c4b6c91 100644
--- a/src/main/java/com/qs/serve/common/model/tag/TagFiledUtil.java
+++ b/src/main/java/com/qs/serve/common/model/tag/TagFiledUtil.java
@@ -29,12 +29,12 @@ public class TagFiledUtil {
             if(!StringUtils.hasText(tag.getTargetType())){
                 continue;
             }
-            if (StringUtils.hasText(tag.getTargetName()) || CollUtil.isNotEmpty(tag.getTagIds())){
+            if (StringUtils.hasText(tag.getTagName()) || CollUtil.isNotEmpty(tag.getTagIds())){
                 String sqlColumn = TbsCostApplyPageMap.get(tag.getDataField());
                 if(StringUtils.hasText(sqlColumn)){
                     TagQuery newVal = new TagQuery();
                     newVal.setTargetType(tag.getTargetType());
-                    newVal.setTargetName(tag.getTargetName());
+                    newVal.setTagName(tag.getTagName());
                     newVal.setTagIds(tag.getTagIds());
                     newVal.setSqlColumn(sqlColumn);
                     newList.add(newVal);
diff --git a/src/main/java/com/qs/serve/modules/tag/entity/so/TagQuery.java b/src/main/java/com/qs/serve/modules/tag/entity/so/TagQuery.java
index f15948ef..d9725177 100644
--- a/src/main/java/com/qs/serve/modules/tag/entity/so/TagQuery.java
+++ b/src/main/java/com/qs/serve/modules/tag/entity/so/TagQuery.java
@@ -16,7 +16,7 @@ public class TagQuery {
      */
     private String targetType;
 
-    private String targetName;
+    private String tagName;
 
     private List<Long> tagIds;
 
diff --git a/src/main/resources/mapper/tag/TagDataMapper.xml b/src/main/resources/mapper/tag/TagDataMapper.xml
index a120c2ae..0b726517 100644
--- a/src/main/resources/mapper/tag/TagDataMapper.xml
+++ b/src/main/resources/mapper/tag/TagDataMapper.xml
@@ -72,11 +72,11 @@
 
     <sql id="tagSelectSql">
         <if test="query.tagQueryList!=null and query.tagQueryList.size > 0">
-            <foreach collection="query.tagQueryList" item="tagQuery" index="i" open="(" close=")" separator=",">
+            <foreach collection="query.tagQueryList" item="tagQuery" index="i" separator=",">
                 and ${tagQuery.sqlColumn} in
                 (
                 select target_id from tag_data
-                left join tag_info on tag_data.tag_id = tag_info.id and del_flag=0
+                left join tag_info on tag_data.tag_id = tag_info.id and tag_info.del_flag=0
                 where tag_data.del_flag = 0
                 <if test="tagQuery.tagIds!=null and tagQuery.tagIds.size > 0">
                     and tag_id in
@@ -84,8 +84,8 @@
                         #{selectId}
                     </foreach>
                 </if>
-                <if test="tagQuery.targetName!=null and tagQuery.targetName!=''">
-                    and target_name like concat('%',#{tagQuery.targetName},'%')
+                <if test="tagQuery.tagName!=null and tagQuery.tagName!=''">
+                    and tag_info.tag_name like concat('%',#{tagQuery.tagName},'%')
                 </if>
                 and tag_data.target_type = #{tagQuery.targetType}
                 group by tag_data.target_id