From c84d8ecd97d111b01db9cfd807300d0491a95bc8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 08 一月 2019 16:38:34 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
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..b0a8826 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);
@@ -396,7 +396,7 @@
int maxOrder = swiperPictureService.getMaxOrderByBannerID(bannerId);
record.setOrder(maxOrder + 1);
-
+ // 榛樿鍋滅敤
record.setState(1);
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