|
|
@ -67,9 +67,6 @@ import java.util.Map; |
|
|
|
@Service |
|
|
|
public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implements NewsService { |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private NewsRedis newsRedis; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private NewsDepartmentService newsDepartmentService; |
|
|
|
|
|
|
@ -114,9 +111,9 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem |
|
|
|
wrapper.eq(StringUtils.isNotBlank(keyword), "NEWS_TITLE", keyword); |
|
|
|
//draft 前端传上来的一个标志 有则代表是存草稿箱的 1
|
|
|
|
if (StringUtils.isNotEmpty(draft)) { |
|
|
|
wrapper.eq(StringUtils.isNotBlank(draft), "NEWS_RELEASE_STATE", "1"); |
|
|
|
wrapper.eq(StringUtils.isNotBlank(draft), "NEWS_RELEASE_STATE", YesOrNoEnum.YES.value()); |
|
|
|
} else { |
|
|
|
wrapper.eq(StringUtils.isNotBlank(draft), "NEWS_RELEASE_STATE", "0"); |
|
|
|
wrapper.eq("NEWS_RELEASE_STATE", YesOrNoEnum.NO.value()); |
|
|
|
} |
|
|
|
wrapper.orderByDesc("CREATED_TIME"); |
|
|
|
return wrapper; |
|
|
@ -174,7 +171,7 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem |
|
|
|
String onLineState = parmas.get("onLineState"); |
|
|
|
NewsDTO newsDTO = get(id); |
|
|
|
//判断下是不是上线 是的话才执行
|
|
|
|
if ("1".equals(newsDTO.getNewsUpDownState())) { |
|
|
|
if (YesOrNoEnum.YES.value().equals(newsDTO.getNewsUpDownState())) { |
|
|
|
newsDTO.setNewsUpDownState(onLineState); |
|
|
|
NewsEntity entity = ConvertUtils.sourceToTarget(newsDTO, NewsEntity.class); |
|
|
|
updateById(entity); |
|
|
@ -241,7 +238,7 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem |
|
|
|
throw new RenException("获取部门信息失败"); |
|
|
|
} |
|
|
|
newsGridList = adminResult.getData(); |
|
|
|
}else { |
|
|
|
} else { |
|
|
|
} |
|
|
|
if (isSave) { |
|
|
|
insert(entity); |
|
|
@ -277,6 +274,7 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public Result modifyStatement(EpdcNewsStatementFromDTO statementFromDto) { |
|
|
|
NewsDTO newsDto = get(statementFromDto.getNewsId()); |
|
|
|
|
|
|
|