From 9107e76fa5d2c31d7e5145029f33abd0c7a9d794 Mon Sep 17 00:00:00 2001
From: linhw <5331581+linhw11@user.noreply.gitee.com>
Date: Thu, 1 Aug 2024 10:44:43 +0800
Subject: [PATCH] ~

---
 .../src/main/java/com/ruoyi/app/service/ScheduledService.java | 1 +
 .../java/com/ruoyi/app/service/impl/AppEventsServiceImpl.java | 2 +-
 .../src/main/resources/mapper/app/AppEventsMapper.xml         | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/ScheduledService.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/ScheduledService.java
index 3f93077..b1f934c 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/ScheduledService.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/ScheduledService.java
@@ -25,6 +25,7 @@ public class ScheduledService {
             appUserMapper.updateAppUserById(ids);
         }*/
     }
+    //0 * * ? * *
 
     @Scheduled(cron = "0 */1 * * * *")
     public void updateEvents(){
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 2bde811..8f7c1b6 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
@@ -48,7 +48,7 @@ public class AppEventsServiceImpl implements IAppEventsService
      */
     @Override
     public List<AppEvents> selectAppEventsList(AppEvents appEvents) {
-        if (appEvents != null && appEvents.getType() == 4 && appEvents.getUserId() != null) {
+        if (appEvents.getType() != null && appEvents.getType() == 4 && appEvents.getUserId() != null) {
             appEvents.setType(2l);
             AppEventsUser appEventsUser = new AppEventsUser();
             appEventsUser.setUserId(appEvents.getUserId());
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 2f5ed95..241f597 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
@@ -115,11 +115,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where
         <if test="type == 1">
             type = 1
-            and start_time gt;= now()
+            and date_format(start_time,'%Y-%m-%d %H:%i') &gt;= date_format(now(),'%Y-%m-%d %H:%i')
         </if>
         <if test="type == 2">
             type = 2
-            and end_time gt;= now()
+            and date_format(end_time,'%Y-%m-%d %H:%i') &gt;= date_format(now(),'%Y-%m-%d %H:%i')
         </if>
     </update>