From 33b9ad6525be3a62858fda87bdf0ef63063f0a5b Mon Sep 17 00:00:00 2001
From: wu <wsjxh1023@163.com>
Date: Mon, 9 Oct 2023 14:24:44 +0800
Subject: [PATCH] bugfix

---
 .../main/java/com/ruoyi/zhiyuanzhe/domain/BPersonTags.java  | 6 ++++++
 .../main/resources/mapper/zhiyuanzhe/ActivityUserMapper.xml | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/domain/BPersonTags.java b/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/domain/BPersonTags.java
index 4ee872a..3d17a28 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/domain/BPersonTags.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/domain/BPersonTags.java
@@ -26,6 +26,12 @@ public class BPersonTags extends BaseEntity {
      * 编号
      */
     private Long id;
+
+    /**
+     * 用户标签id
+     */
+    @ApiModelProperty(value = "用户标签id")
+    private Long tagsId;
     /**
      * 用户id
      */
diff --git a/ruoyi-system/src/main/resources/mapper/zhiyuanzhe/ActivityUserMapper.xml b/ruoyi-system/src/main/resources/mapper/zhiyuanzhe/ActivityUserMapper.xml
index ab928f7..1ae90ba 100644
--- a/ruoyi-system/src/main/resources/mapper/zhiyuanzhe/ActivityUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/zhiyuanzhe/ActivityUserMapper.xml
@@ -5,6 +5,7 @@
 <mapper namespace="com.ruoyi.zhiyuanzhe.mapper.ActivityUserMapper">
     <resultMap type="BPersonTags" id="personTags">
         <result property="id" column="id"/>
+        <result property="tagsId" column="tags_id"/>
         <result property="uId" column="u_id"/>
         <result property="ageRange" column="age_range"/>
         <result property="housingRange" column="housing_range"/>
@@ -109,7 +110,8 @@
         where activity_id = #{activityId}
     </delete>
     <select id="findUserByStatusAndActivityId" resultMap="personTags">
-        select bau.id, bau.u_id, bpt.age_range, bpt.housing_range, bpt.education_range, bpt.interest_range,
+        select bau.id,bpt.id tags_id, bau.u_id, bpt.age_range, bpt.housing_range, bpt.education_range,
+        bpt.interest_range,
         bpt.political_range, bpt.sex_range,
         bpt.nationality_range, bpt.professional_range, bpt.industry_range, bpt.school_range, bpt.create_id,
         bpt.create_by, bpt.create_time,