From 3efc4acb63f35129a90b81cdfa3a368f311f8c5c Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Wed, 19 Jun 2024 11:36:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=9C=A8=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/controller/bus/SpecialUserController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zcloud/controller/bus/SpecialUserController.java b/src/main/java/com/zcloud/controller/bus/SpecialUserController.java index 2b96d966..b82b495a 100644 --- a/src/main/java/com/zcloud/controller/bus/SpecialUserController.java +++ b/src/main/java/com/zcloud/controller/bus/SpecialUserController.java @@ -11,6 +11,7 @@ import com.alibaba.fastjson.JSON; import com.zcloud.aspect.DockAnnotation; import com.zcloud.service.system.UsersService; import com.zcloud.util.Jurisdiction; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -209,8 +210,8 @@ public class SpecialUserController extends BaseController { String validity_time_end = pageData.getString("VALIDITY_TIME_END"); Date endTime = sdf.parse(validity_time_end); Date currentTime = new Date(); - if (startTime.compareTo(currentTime) >= 1 && currentTime.compareTo(endTime) >= 1) { - if (pageData.get("ISREVIEW").equals("1")){ + if (startTime.compareTo(currentTime) < 0 && currentTime.compareTo(endTime) < 0) { + if (StringUtils.equals("1",pageData.getString("ISREVIEW"))){ pageData.put("ISEFFECTIVE","是"); } else { pageData.put("ISEFFECTIVE","否");