From bb6e9bc24307d43d2c4b172b0aaea7cbca7f5640 Mon Sep 17 00:00:00 2001
From: wu <wsjxh1023@163.com>
Date: Fri, 6 Oct 2023 18:10:28 +0800
Subject: [PATCH] bugfix

---
 .../java/com/ruoyi/zhiyuanzhe/mapper/ActivityUserMapper.java  | 2 +-
 .../main/resources/mapper/zhiyuanzhe/ActivityUserMapper.xml   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/mapper/ActivityUserMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/mapper/ActivityUserMapper.java
index aff7d84..1347c13 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/mapper/ActivityUserMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/mapper/ActivityUserMapper.java
@@ -60,7 +60,7 @@ public interface ActivityUserMapper {
      *
      * @param req 活动id和用户id
      */
-    void enroll(ActivityInviteRequest req);
+    void enroll(@Param("req") ActivityInviteRequest req);
 
     /**
      * 活动邀请列表
diff --git a/ruoyi-system/src/main/resources/mapper/zhiyuanzhe/ActivityUserMapper.xml b/ruoyi-system/src/main/resources/mapper/zhiyuanzhe/ActivityUserMapper.xml
index 6e38b5d..01aa8fd 100644
--- a/ruoyi-system/src/main/resources/mapper/zhiyuanzhe/ActivityUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/zhiyuanzhe/ActivityUserMapper.xml
@@ -56,7 +56,7 @@
         <result property="userId" column="user_id"/>
         <result property="deptId" column="dept_id"/>
         <result property="endTime" column="end_time"/>
-        <result property="status" column="status"/>
+        <result property="activityStatus" column="activityStatus"/>
         <result property="degreeOfMatch" column="degree_of_match"/>
     </resultMap>
 
@@ -116,7 +116,7 @@
         order by bau.degree_of_match desc
     </select>
     <select id="eventRecommendations" resultMap="activityResult">
-        select bau.degree_of_match, bau.status, ba.*
+        select bau.degree_of_match, bau.status activityStatus, ba.*
         from b_activity_user bau
         left join b_activity ba on bau.activity_id = ba.id
         where ba.status = 1 and bau.degree_of_match != 0