From b3c6911c1e78563dc04998dd7bfb510130a9fcec Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 01 二月 2021 16:37:52 +0800
Subject: [PATCH] auth

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
index fe08ea4..80706b6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
@@ -50,6 +50,8 @@
         String address = comActDiscussDTO.getAddress();
         if (ObjectUtils.isEmpty(address)) {
             return R.fail("地址不能为空");
+        }else if(address.contains("null")){
+            comActDiscussDTO.setAddress(null);
         }
         LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
         Long userId = loginUserInfo.getUserId();
@@ -96,11 +98,19 @@
         return communityService.putDiscussUser(comActDiscussUserDTO);
     }
 
+    @ApiOperation(value = "一起议-评论-点赞、取消点赞")
+    @PutMapping("discusscommentuser")
+    public R putDiscussCommentUser(@RequestBody @Validated ComActDiscussCommentUserDTO comActDiscussUserDTO) {
+        comActDiscussUserDTO.setUserId(this.getUserId());
+        return communityService.putDiscussCommentUser(comActDiscussUserDTO);
+    }
+
     @ApiOperation(value = "一起议-详情",response = ComActDiscussVO.class)
     @GetMapping("discuss")
     @ApiImplicitParam(name = "id",value = "一起议主键",required = true)
     public R detailDiscuss(@RequestParam("id") Long id) {
-        return communityService.detailDiscussApplets(id);
+        Long userId = this.getUserId();
+        return communityService.detailDiscussApplets(id,userId);
     }
 
     @ApiOperation(value = "一起议-评论-分页查询",response = ComActDiscussCommentVO.class)
@@ -110,6 +120,7 @@
         if (null==id||0==id) {
             return R.fail("一起议主键不能为空");
         }
+        pageComActDiscussCommentDTO.setLoginUserId(this.getUserId());
         return communityService.pageDiscussCommentApplets(pageComActDiscussCommentDTO);
     }
 

--
Gitblit v1.7.1