From 8e825039f9e55e7b3ff0bae9f9f671c9503f6af8 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期六, 10 十一月 2018 10:55:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://admin@193.112.35.168:29418/fanli-server.git
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
index 805774e..b90495c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
@@ -164,10 +164,10 @@
}
Integer state = resultObj.getState();
- if (state != null && state.equals(0)) {
- resultObj.setState(1);
- } else {
+ if (state == null || state.equals(1) || state == 1) {
resultObj.setState(0);
+ } else {
+ resultObj.setState(1);
}
swiperBannerService.updateByPrimaryKeySelective(resultObj);
@@ -397,7 +397,7 @@
int maxOrder = swiperPictureService.getMaxOrderByBannerID(bannerId);
record.setOrder(maxOrder + 1);
- record.setState(1);
+ record.setState(0);
record.setCreatetime(new Date());
record.setUpdatetime(new Date());
@@ -596,10 +596,10 @@
}
Integer state = resultObj.getState();
- if (state != null && state.equals(0)) {
- resultObj.setState(1);
- } else {
+ if (state == null || state.equals(1) || state == 1) {
resultObj.setState(0);
+ } else {
+ resultObj.setState(1);
}
swiperPictureService.updateByPrimaryKeySelective(resultObj);
--
Gitblit v1.8.0