From f32cc15f60bf3b5c47267ee256a0deb3bdd01eec Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 23 四月 2020 14:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
index 4fb8b69..8db309c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
@@ -383,10 +383,14 @@
// 璺宠浆閾炬帴
for (Special special : list) {
-
+ if (special.getState() != null && special.getState().longValue() == 0) {
+ special.setState(1L);
+ } else {
+ special.setState(0L);
+ }
+
Date startTime = special.getStartTime();
Date endTime = special.getEndTime();
-
if (startTime == null && endTime == null) {
special.setStartTime_str("");
special.setEndTime_str("");
@@ -729,6 +733,7 @@
Special updateObj = new Special();
updateObj.setId(id);
updateObj.setState(state);
+ updateObj.setJumpLogin(resultObj.isJumpLogin());
specialMapper.updateByPrimaryKeySelective(updateObj);
}
--
Gitblit v1.8.0