|
@@ -90,10 +90,23 @@ public class NewsController extends BaseController {
|
|
|
if (newsInfo.getSubType() == null && newsInfo.getType() == 6) {
|
|
|
return failed("章节不能为空");
|
|
|
}
|
|
|
- // 1 2 3 4 5 6
|
|
|
- if (StringUtil.isEmpty(newsInfo.getCoverImage())) {
|
|
|
- return failed("封面不能为空");
|
|
|
+ // 1 2 3 4 5
|
|
|
+ if (newsInfo.getType() != 2) {
|
|
|
+ if (StringUtil.isEmpty(newsInfo.getCoverImage())) {
|
|
|
+ return failed("封面不能为空");
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if ( "IMAGE".equals(newsInfo.getAttribute2())) {
|
|
|
+ if (StringUtil.isEmpty(newsInfo.getCoverImage())) {
|
|
|
+ return failed("封面不能为空");
|
|
|
+ }
|
|
|
+ } else if ("VIDEO".equals(newsInfo.getAttribute2())){
|
|
|
+ if (StringUtil.isEmpty(newsInfo.getLinkUrl())) {
|
|
|
+ return failed("视频地址不能为空");
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
// 1 4 6
|
|
|
if (newsInfo.getType() == 1 ||newsInfo.getType() == 4 || newsInfo.getType() == 6) {
|
|
|
if (newsInfo.getOrder() == null) {
|
|
@@ -145,10 +158,18 @@ public class NewsController extends BaseController {
|
|
|
if(NewsStatusEnum.SHOW.getCode().equals(sysNewsInformationDto.getStatus().getCode())) {
|
|
|
return failed("启用状态下,不可修改");
|
|
|
}
|
|
|
+ if (newsInfo.getType() == 2) {
|
|
|
+ if ( "IMAGE".equals(newsInfo.getAttribute2())) {
|
|
|
+ newsInfo.setLinkUrl("");
|
|
|
+ } else if ("VIDEO".equals(newsInfo.getAttribute2())){
|
|
|
+ newsInfo.setCoverImage("");
|
|
|
+ }
|
|
|
+ }
|
|
|
HttpResponseResult<Object> check = check(newsInfo);
|
|
|
if (!check.getStatus()) {
|
|
|
return check;
|
|
|
}
|
|
|
+
|
|
|
newsInfo.setStatus(NewsStatusEnum.HIDDEN);
|
|
|
newsInfo.setUpdateTime(new Date());
|
|
|
newsInfo.setUpdateBy(sysUser.getId());
|