From 4f5461e4d93d82ecd7ae19bd2c77dd8a844f5276 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Wed, 5 Feb 2020 10:52:47 +0800
Subject: [PATCH] =?UTF-8?q?bug#5072=E7=88=B1=E5=BF=83=E4=BA=92=E5=8A=A9ban?=
 =?UTF-8?q?ner=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ActBannerServiceImpl.java    | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java
index 4734d45b9..4467d3c8f 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java
@@ -21,9 +21,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.ActStateConstant;
 import com.elink.esua.epdc.modules.activity.dao.ActBannerDao;
@@ -74,12 +74,18 @@ public class ActBannerServiceImpl extends BaseServiceImpl<ActBannerDao, ActBanne
         return ConvertUtils.sourceToTarget(entityList, ActBannerDTO.class);
     }
 
-    private QueryWrapper<ActBannerEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
+    private QueryWrapper<ActBannerEntity> getWrapper(Map<String, Object> params) {
+        String id = "";
+        String status = "";
+        if (params.containsKey(FieldConstant.ID_HUMP)) {
+            id = (String) params.get(FieldConstant.ID_HUMP);
+        }
+        if (params.containsKey("status")) {
+            status = params.get("status").toString();
+        }
         QueryWrapper<ActBannerEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id)
+                .eq(StringUtils.isNotBlank(status), "STATUS", status);
         return wrapper;
     }
 
@@ -127,4 +133,4 @@ public class ActBannerServiceImpl extends BaseServiceImpl<ActBannerDao, ActBanne
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}