From a1554a3b3449d75d31534e333934a4408be271f8 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Thu, 26 Sep 2019 19:13:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/service/impl/BannerServiceImpl.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java index b40063603..6299abcad 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java @@ -80,15 +80,12 @@ public class BannerServiceImpl extends BaseServiceImpl private QueryWrapper getWrapper(Map params) { UserDetail user = SecurityUser.getUser(); - //部门ID列表 - List deptIdList = user.getDeptIdList(); String id = (String) params.get(FieldConstant.ID_HUMP); String title = ((String) params.get("title")).trim(); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); wrapper.eq(FieldConstant.CREATED_BY, user.getId()); wrapper.like(StringUtils.isNotBlank(title), "TITLE", title); - wrapper.in(CollUtil.isNotEmpty(deptIdList), "GRID_ID", deptIdList); return wrapper; } @@ -106,9 +103,10 @@ public class BannerServiceImpl extends BaseServiceImpl dto.setDeptId(user.getDeptId()); dto.setDeptName(user.getDeptName()); BannerEntity entity = ConvertUtils.sourceToTarget(dto, BannerEntity.class); - entity.setState(YesOrNoEnum.NO.value()); - - + // 新增 + if (StringUtils.isBlank(dto.getId())) { + entity.setState(YesOrNoEnum.NO.value()); + } // 通知所属部门id Long noticeDeptId = entity.getStreetId(); // 能接收通知的所有网格的ID