guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0205cmt' into 0205cmt

0927cmt
songwenxuan 2024-06-20 16:40:45 +08:00
parent cc6b208e08 8b456819e7
commit 4fb481c144
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zcloud/controller/bus/SpecialUserController.java
View File

@ -11,6 +11,7 @@ import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation; import com.zcloud.aspect.DockAnnotation;
import com.zcloud.service.system.UsersService; import com.zcloud.service.system.UsersService;
import com.zcloud.util.Jurisdiction; import com.zcloud.util.Jurisdiction;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; 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"); String validity_time_end = pageData.getString("VALIDITY_TIME_END");
Date endTime = sdf.parse(validity_time_end); Date endTime = sdf.parse(validity_time_end);
Date currentTime = new Date(); Date currentTime = new Date();
if (startTime.compareTo(currentTime) >= 1 && currentTime.compareTo(endTime) >= 1) { if (startTime.compareTo(currentTime) < 0 && currentTime.compareTo(endTime) < 0) {
if (pageData.get("ISREVIEW").equals("1")){ if (StringUtils.equals("1",pageData.getString("ISREVIEW"))){
pageData.put("ISEFFECTIVE","是"); pageData.put("ISEFFECTIVE","是");
} else { } else {
pageData.put("ISEFFECTIVE","否"); pageData.put("ISEFFECTIVE","否");