提交 fb932eef 作者: 张小凤

GambitController(update)

上级 3fea7434
...@@ -74,19 +74,16 @@ public class DynamicController extends BaseController { ...@@ -74,19 +74,16 @@ public class DynamicController extends BaseController {
return dynamicService.deleteComment(id); return dynamicService.deleteComment(id);
} }
*/ */
@ApiOperation(value = "动态详情") @ApiOperation(value = "动态详情")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = DynamicVO.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = DynamicVO.class)})
@GetMapping("/dynamicDetails") @GetMapping("/dynamicDetails")
public ResultBody<DynamicVO> dynamicDetails(@RequestParam Integer dynamicId, HttpServletRequest request, public ResultBody<DynamicVO> dynamicDetails(@RequestParam Integer dynamicId, HttpServletRequest request,
@RequestParam(required = false) Integer userAccountId) { @RequestParam(required = false) Integer userAccountId) {
String token = request.getHeader("token"); if (userAccountId==null){
if (token!=null){
log.info("token"+token);
Integer userAccountId1 = this.getUserLoginInfoFromRedis(request).getUserAccountId(); Integer userAccountId1 = this.getUserLoginInfoFromRedis(request).getUserAccountId();
log.info("token报错阿诗丹顿多多多多多多多多多多多多多多多多多多多多多多多多多多多多多多多多多多多"); userAccountId=userAccountId1;
if (userAccountId==null){
userAccountId=userAccountId1;
}
} }
return dynamicService.dynamicDetails(dynamicId, userAccountId, request); return dynamicService.dynamicDetails(dynamicId, userAccountId, request);
} }
......
...@@ -108,13 +108,11 @@ public class GambitController extends BaseController{ ...@@ -108,13 +108,11 @@ public class GambitController extends BaseController{
@ApiOperation(value = "动态对应的所有评论") @ApiOperation(value = "动态对应的所有评论")
@PostMapping("/allCommentList") @PostMapping("/allCommentList")
public ResultBody<ForumReviewDO> allCommentList(HttpServletRequest request, @RequestBody AllReviewQO allReviewQO){ public ResultBody<ForumReviewDO> allCommentList(HttpServletRequest request, @RequestBody AllReviewQO allReviewQO){
String token = request.getHeader("token");
if (token!=null){ Integer userAccountId = allReviewQO.getUserAccountId();
Integer userAccountId = this.getUserLoginInfoFromRedis(request).getUserAccountId(); if (userAccountId==null){
Integer userAccountId1 = allReviewQO.getUserAccountId(); Integer userAccountId2 = this.getUserLoginInfoFromRedis(request).getUserAccountId();
if (userAccountId1==null){ allReviewQO.setUserAccountId(userAccountId2);
allReviewQO.setUserAccountId(userAccountId);
}
} }
allReviewQO.setUserAccountId(allReviewQO.getUserAccountId()); allReviewQO.setUserAccountId(allReviewQO.getUserAccountId());
return ResultBody.success(gambitService.allCommentList(allReviewQO)); return ResultBody.success(gambitService.allCommentList(allReviewQO));
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论