Browse Source

修改回复,没有设置用户,也可以回复

DESKTOP-USV654P\pc 1 year ago
parent
commit
eee8581a59

+ 8 - 2
src/main/java/com/xjrsoft/module/oa/controller/NewsController.java

@@ -205,8 +205,14 @@ public class NewsController {
                 Wrappers.<NewsRelation>query().lambda()
                         .eq(NewsRelation::getNewsId,newsReplyDto.getId())
                         .eq(NewsRelation::getUserId,StpUtil.getLoginIdAsLong()));
-        if (newsReplyDto.getReplyContent() == null || newsRelation == null) {
-            throw new Exception("参数异常");
+        if (newsRelation == null) {
+            newsRelation = new NewsRelation();
+            newsRelation.setNewsId(newsReplyDto.getId());
+            newsRelation.setUserId(StpUtil.getLoginIdAsLong());
+            newsRelation.setReadMark(1);
+            newsRelation.setReadDate(LocalDateTime.now());
+            newsRelation.setReplyContent(newsReplyDto.getReplyContent());
+            return R.ok(newsRelationService.save(newsRelation));
         }
 
         if (newsRelation.getReadMark()==null || newsRelation.getReadMark() == 0) {

+ 5 - 0
src/main/java/com/xjrsoft/module/oa/dto/NewsReplyDto.java

@@ -3,11 +3,16 @@ package com.xjrsoft.module.oa.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 @Data
 public class NewsReplyDto {
 
+    @NotNull(message = "新闻主键不能为空!")
     @ApiModelProperty("主键")
     private Long id;
+
+    @NotNull(message = "回复内容不能为空!")
     @ApiModelProperty("回复内容")
     private String replyContent;
 }