From f045477807d5fb03f675e4c820ba698884d863b8 Mon Sep 17 00:00:00 2001
From: linhw <5331581+linhw11@user.noreply.gitee.com>
Date: Mon, 29 Jul 2024 18:24:38 +0800
Subject: [PATCH] ~

---
 .../java/com/ruoyi/app/domain/AppEvents.java   |  3 +++
 .../com/ruoyi/app/domain/AppEventsUser.java    |  4 ++++
 .../app/service/impl/AppEventsServiceImpl.java | 18 ++++++++++++++++--
 .../resources/mapper/app/AppEventsMapper.xml   |  6 ++++++
 .../mapper/app/AppEventsUserMapper.xml         | 11 ++++++++---
 5 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppEvents.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppEvents.java
index e004b19..0c45c71 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppEvents.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppEvents.java
@@ -60,6 +60,9 @@ public class AppEvents extends BaseEntity
 
     private List<Long> ids;
 
+    private Long userId;
+
+
     public void setId(Long id) 
     {
         this.id = id;
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppEventsUser.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppEventsUser.java
index 9dd2c5c..ca16bb5 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppEventsUser.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppEventsUser.java
@@ -1,5 +1,6 @@
 package com.ruoyi.app.domain;
 
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -11,6 +12,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author wyh
  * @date 2024-07-23
  */
+@Data
 public class AppEventsUser extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -38,6 +40,8 @@ public class AppEventsUser extends BaseEntity
     @Excel(name = "微信号")
     private String wechatId;
 
+    private Long userId;
+
     public void setId(Long id) 
     {
         this.id = id;
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppEventsServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppEventsServiceImpl.java
index 5d6b0d3..b0a02a6 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppEventsServiceImpl.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppEventsServiceImpl.java
@@ -1,6 +1,10 @@
 package com.ruoyi.app.service.impl;
 
 import java.util.List;
+import java.util.stream.Collectors;
+
+import com.ruoyi.app.domain.AppEventsUser;
+import com.ruoyi.app.mapper.AppEventsUserMapper;
 import com.ruoyi.common.core.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,6 +24,9 @@ public class AppEventsServiceImpl implements IAppEventsService
     @Autowired
     private AppEventsMapper appEventsMapper;
 
+    @Autowired
+    private AppEventsUserMapper appEventsUserMapper;
+
     /**
      * 查询活动发布
      * 
@@ -39,8 +46,15 @@ public class AppEventsServiceImpl implements IAppEventsService
      * @return 活动发布
      */
     @Override
-    public List<AppEvents> selectAppEventsList(AppEvents appEvents)
-    {
+    public List<AppEvents> selectAppEventsList(AppEvents appEvents) {
+        if (appEvents.getType() == 4 && appEvents.getUserId() != null) {
+            AppEventsUser appEventsUser = new AppEventsUser();
+            appEventsUser.setUserId(appEvents.getUserId());
+            List<AppEventsUser> list = appEventsUserMapper.selectAppEventsUserList(appEventsUser);
+            if (list != null && list.size() > 0) {
+                appEvents.setIds(list.stream().map(x->x.getEventsId()).distinct().collect(Collectors.toList()));
+            }
+        }
         return appEventsMapper.selectAppEventsList(appEvents);
     }
 
diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppEventsMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppEventsMapper.xml
index 9401615..2f5ed95 100644
--- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppEventsMapper.xml
+++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppEventsMapper.xml
@@ -37,6 +37,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null "> and end_time = #{endTime}</if>
             <if test="updateBy != null  and updateBy != ''"> and updateBy = #{updateBy}</if>
             <if test="type != null "> and type = #{type}</if>
+            <if test="ids != null and ids.size() > 0">
+                and id in
+                <foreach collection="ids" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
     
diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppEventsUserMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppEventsUserMapper.xml
index f5e913b..e4e1578 100644
--- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppEventsUserMapper.xml
+++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppEventsUserMapper.xml
@@ -16,10 +16,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createBy"    column="create_by"    />
         <result property="updateBy"    column="updateBy"    />
         <result property="remark"    column="remark"    />
+        <result property="userId"    column="user_id"    />
     </resultMap>
 
     <sql id="selectAppEventsUserVo">
-        select id, events_id, name, company_name, phone, wechat_id, create_time, update_time, create_by, updateBy, remark from app_events_user
+        select id, events_id, name, company_name, phone, wechat_id, create_time, update_time, create_by, updateBy, remark, user_id from app_events_user
     </sql>
 
     <select id="selectAppEventsUserList" parameterType="AppEventsUser" resultMap="AppEventsUserResult">
@@ -31,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
             <if test="wechatId != null  and wechatId != ''"> and wechat_id = #{wechatId}</if>
             <if test="updateBy != null  and updateBy != ''"> and updateBy = #{updateBy}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
         </where>
     </select>
     
@@ -52,7 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">updateBy,</if>
             <if test="remark != null">remark,</if>
-         </trim>
+            <if test="userId != null">user_id,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="eventsId != null">#{eventsId},</if>
             <if test="name != null">#{name},</if>
@@ -64,7 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+            <if test="userId != null">#{userId},</if>
+        </trim>
     </insert>
 
     <update id="updateAppEventsUser" parameterType="AppEventsUser">
@@ -80,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">updateBy = #{updateBy},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="userId != null">user_id = #{userId},</if>
         </trim>
         where id = #{id}
     </update>