commit

src/main/java/io/v/nutz/sys/controllers/platform/sys/SysHomeActivityController.java

@@ -1,5 +1,6 @@
 package io.v.nutz.sys.controllers.platform.sys;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.wizzer.framework.base.Result;
 import cn.wizzer.framework.page.Pagination;
@@ -22,6 +23,7 @@ import org.nutz.mvc.annotation.Ok;
 
 import javax.validation.Valid;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @IocBean
@@ -91,10 +93,17 @@ public class SysHomeActivityController {
         FieldFilter fieldFilter = FieldFilter.locked(Sys_home_activity.class, "classPath");
         List<Sys_home_activity> list = Daos.ext(dao,fieldFilter) .query(Sys_home_activity.class, Cnd.where("enable", "=", 1).desc("top"));
         String userId = ShiroUtil.getUserId();
-
         List<Sys_home_activity> allowActivityList = new ArrayList<>();
-
+        // 今天的时间
+        Date today = DateUtil.date();
         for (Sys_home_activity activity : list) {
+            // 该活动的时间范围
+            Date startDate = activity.getStartDate();
+            Date endDate = activity.getEndDate();
+            // 判断当前时间是否在活动范围内，不在就过滤掉
+            if (!DateUtil.isIn(today, startDate, endDate)) {
+                continue;
+            }
             Integer allowUserGroupId = activity.getAllowUserGroupId();
             String allowUserSql = activity.getAllowUserSql();
             activity.setAllowUserSql(null);