|
@ -120,13 +120,14 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem |
|
|
if (StringUtils.isNotBlank(gridId)) { |
|
|
if (StringUtils.isNotBlank(gridId)) { |
|
|
wrapper.like("ALL_DEPT_IDS", gridId.trim()); |
|
|
wrapper.like("ALL_DEPT_IDS", gridId.trim()); |
|
|
} |
|
|
} |
|
|
wrapper.eq(FieldConstant.CREATED_BY, user.getId()); |
|
|
wrapper.in("DEPT_ID", user.getDeptIdList()); |
|
|
//draft 前端传上来的一个标志 有则代表是存草稿箱的 1
|
|
|
//draft 前端传上来的一个标志 有则代表是存草稿箱的 1
|
|
|
if (StringUtils.isNotEmpty(draft)) { |
|
|
if (StringUtils.isNotEmpty(draft)) { |
|
|
wrapper.eq(StringUtils.isNotBlank(draft), "NEWS_RELEASE_STATE", YesOrNoEnum.YES.value()); |
|
|
wrapper.eq(StringUtils.isNotBlank(draft), "NEWS_RELEASE_STATE", YesOrNoEnum.YES.value()); |
|
|
} else { |
|
|
} else { |
|
|
wrapper.eq("NEWS_RELEASE_STATE", YesOrNoEnum.NO.value()); |
|
|
wrapper.eq("NEWS_RELEASE_STATE", YesOrNoEnum.NO.value()); |
|
|
} |
|
|
} |
|
|
|
|
|
wrapper.groupBy("ID"); |
|
|
wrapper.orderByDesc(FieldConstant.CREATED_TIME); |
|
|
wrapper.orderByDesc(FieldConstant.CREATED_TIME); |
|
|
return wrapper; |
|
|
return wrapper; |
|
|
} |
|
|
} |
|
@ -176,7 +177,6 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
public void update(NewsDTO dto) { |
|
|
public void update(NewsDTO dto) { |
|
@ -344,6 +344,7 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 查看新闻详情时,判断是否要插入新闻已读表 |
|
|
* 查看新闻详情时,判断是否要插入新闻已读表 |
|
|
|
|
|
* |
|
|
* @param formDto |
|
|
* @param formDto |
|
|
* @return void |
|
|
* @return void |
|
|
* @Author zhangyong |
|
|
* @Author zhangyong |
|
@ -361,6 +362,7 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem |
|
|
} |
|
|
} |
|
|
// 否无操作
|
|
|
// 否无操作
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
public Result modifyStatement(EpdcNewsStatementFromDTO statementFromDto) { |
|
|
public Result modifyStatement(EpdcNewsStatementFromDTO statementFromDto) { |
|
@ -543,11 +545,10 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* |
|
|
|
|
|
* 组织机构信息处理 |
|
|
* 组织机构信息处理 |
|
|
* |
|
|
* |
|
|
* @params [dto, newsList] |
|
|
|
|
|
* @return java.util.List<com.elink.esua.epdc.entity.NewsEntity> |
|
|
* @return java.util.List<com.elink.esua.epdc.entity.NewsEntity> |
|
|
|
|
|
* @params [dto, newsList] |
|
|
* @author liuchuang |
|
|
* @author liuchuang |
|
|
* @since 2020/3/7 14:47 |
|
|
* @since 2020/3/7 14:47 |
|
|
*/ |
|
|
*/ |
|
|