From d4f097c57f9636ae746cddcb7593e3fb7aa9a077 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 12 十一月 2022 17:31:55 +0800
Subject: [PATCH] token获取物业id处理

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
index cfb768b..bc0eaf4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
@@ -20,6 +20,7 @@
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
@@ -30,6 +31,7 @@
 import java.util.List;
 
 import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
 
 /**
  * ClassName   ComEventController
@@ -69,7 +71,9 @@
         comEvent.setRequestUserId(loginUser.getUserId());
         comEvent.setRequestUserName(loginUser.getName());
         comEvent.setRequestUserTel(loginUser.getPhone());
-        //comEvent.setAppId(loginUser.getAppId());
+        if (isNull(comEventVO.getAppId())){
+            comEvent.setAppId(loginUser.getAppId());
+        }
         return comEventService.insertComEvent(comEvent);
     }
 
@@ -159,7 +163,11 @@
     @PostMapping("/page")
     public R page(@RequestBody ComEventVO comEventVO, Long pageNo, Long pageSize) {
         Page pagination = new Page(pageNo, pageSize);
-        ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class);
+        ComEvent comEvent=new ComEvent();
+        BeanUtils.copyProperties(comEventVO, comEvent);
+        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+        String appId = userService.detailUser(loginUserInfo.getUserId()).getData().getAppId();
+        comEvent.setAppId(appId);
         return comEventService.pageByComEvent(comEvent, pagination,this.getLoginUserInfo());
     }
 

--
Gitblit v1.7.1