From 8d493a008ce655963f0363b116d5b55e02eff3d6 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 16 十一月 2022 09:45:13 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java
index 9803c2f..67cc2e9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java
@@ -11,6 +11,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;
@@ -18,6 +19,8 @@
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.HashMap;
+
+import static java.util.Objects.nonNull;
/**
* ClassName ComEventController
@@ -83,8 +86,13 @@
@ApiOperation(value = "三说会堂事件表分页列表数据", notes = "三说会堂事件表分页列表数据")
@PostMapping("/page")
public R page(@RequestBody ComEventPageRequestVO comEventPageRequestVO) {
- ComEventVO comEventVO = CopyUtil.copyProperties(comEventPageRequestVO, ComEventVO.class);
+ log.info("================appId="+comEventPageRequestVO);
+ ComEventVO comEventVO = new ComEventVO();
+ BeanUtils.copyProperties(comEventPageRequestVO,comEventVO);
comEventPageRequestVO.setCreateBy(getUserId());
+ if (nonNull(comEventPageRequestVO.getAppId())){
+ comEventVO.setAppId(comEventPageRequestVO.getAppId());
+ }
return comEventService.page(comEventVO, comEventVO.getPageNo(), comEventVO.getPageSize());
}
--
Gitblit v1.7.1