|
|
@ -80,15 +80,12 @@ public class BannerServiceImpl extends BaseServiceImpl<BannerDao, BannerEntity> |
|
|
|
|
|
|
|
private QueryWrapper<BannerEntity> getWrapper(Map<String, Object> params) { |
|
|
|
UserDetail user = SecurityUser.getUser(); |
|
|
|
//部门ID列表
|
|
|
|
List<Long> deptIdList = user.getDeptIdList(); |
|
|
|
String id = (String) params.get(FieldConstant.ID_HUMP); |
|
|
|
String title = ((String) params.get("title")).trim(); |
|
|
|
QueryWrapper<BannerEntity> 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<BannerDao, BannerEntity> |
|
|
|
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
|
|
|
|