Require(update)

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/gambit/qo/AllReviewQO.java

@@ -33,8 +33,7 @@ public class AllReviewQO {
     @ApiModelProperty(value = "动态id",example = "1")
     private String dynamicId;
 
-    @ApiModelProperty(value = "用户id",example = "1",required = true)
-    @NotNull(message = "用户id不能为空")
+    @ApiModelProperty(value = "用户id",example = "1",required = false)
     private Integer userAccountId;
 
     /**

release-service/src/main/java/com/mmc/csf/release/controller/DynamicController.java

@@ -75,8 +75,14 @@ public class DynamicController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = DynamicVO.class)})
     @GetMapping("/dynamicDetails")
     public ResultBody<DynamicVO> dynamicDetails(@RequestParam Integer dynamicId, HttpServletRequest request,
-                                                @RequestParam(required = true) Integer userAccountId) {
-
+                                                @RequestParam(required = false) Integer userAccountId) {
+        String token = request.getHeader("token");
+        if (token!=null){
+            Integer userAccountId1 = this.getUserLoginInfoFromRedis(request).getUserAccountId();
+            if (userAccountId==null){
+                userAccountId=userAccountId1;
+            }
+        }
         return dynamicService.dynamicDetails(dynamicId, userAccountId, request);
     }
 

release-service/src/main/java/com/mmc/csf/release/controller/GambitController.java

@@ -107,8 +107,15 @@ public class GambitController extends BaseController{
 
     @ApiOperation(value = "动态对应的所有评论")
     @PostMapping("/allCommentList")
-    public ResultBody<ForumReviewDO> allCommentList(HttpServletRequest request, @RequestBody @Validated AllReviewQO allReviewQO){
-        //Integer userAccountId = this.getUserLoginInfoFromRedis(request).getUserAccountId();
+    public ResultBody<ForumReviewDO> allCommentList(HttpServletRequest request, @RequestBody  AllReviewQO allReviewQO){
+        String token = request.getHeader("token");
+        if (token!=null){
+            Integer userAccountId = this.getUserLoginInfoFromRedis(request).getUserAccountId();
+            Integer userAccountId1 = allReviewQO.getUserAccountId();
+            if (userAccountId1==null){
+                allReviewQO.setUserAccountId(userAccountId);
+            }
+        }
         allReviewQO.setUserAccountId(allReviewQO.getUserAccountId());
         return ResultBody.success(gambitService.allCommentList(allReviewQO));
     }