From 89df93bcafe7601c28905d888536a05dccbd0195 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 19 五月 2021 15:58:42 +0800
Subject: [PATCH] Merge branch 'cedoodev' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
index bd922be..dfe5b33 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
@@ -12,6 +12,7 @@
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.EldersAuthService;
+import io.swagger.annotations.ApiModelProperty;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;
@@ -78,7 +79,6 @@
Page page = new Page<>();
page.setSize(pageEldersAuthDTO.getPageSize());
page.setCurrent(pageEldersAuthDTO.getPageNum());
-
return R.ok(eldersAuthDAO.selectByPage(page, pageEldersAuthDTO));
}
@@ -97,15 +97,12 @@
* @return 查找结果
*/
public R<EldersAuthDetailsVO> eldersAuthDetails(Long id){
- EldersAuthDO eldersAuthDO = eldersAuthDAO.selectById(id);
- if(eldersAuthDO!=null) {
- EldersAuthDetailsVO eldersAuthDetailsVO = new EldersAuthDetailsVO();
- BeanUtils.copyProperties(eldersAuthDO, eldersAuthDetailsVO);
-
+ EldersAuthDetailsVO eldersAuthDetailsVO = eldersAuthDAO.selectDetails(id);
+ if(eldersAuthDetailsVO!=null) {
//社区反馈
List<EldersAuthFeedbackDO> list =
eldersAuthFeedbackDAO.selectList(new LambdaQueryWrapper<EldersAuthFeedbackDO>()
- .eq(EldersAuthFeedbackDO::getAuthId, eldersAuthDO.getId()));
+ .eq(EldersAuthFeedbackDO::getAuthId, eldersAuthDetailsVO.getId()));
List<EldersAuthFeedbackVO> listVO = new ArrayList<>();
list.forEach(feedDo ->{
EldersAuthFeedbackVO eldersAuthFeedbackVO = new EldersAuthFeedbackVO();
@@ -124,6 +121,8 @@
*/
public R addFeedback(EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO){
EldersAuthFeedbackDO eldersAuthFeedbackDO = new EldersAuthFeedbackDO();
+ eldersAuthFeedbackDO.setCreateBy(eldersAuthFeedbackAddDTO.getUserId());
+ eldersAuthFeedbackDO.setCreateAt(new Date());
BeanUtils.copyProperties(eldersAuthFeedbackAddDTO, eldersAuthFeedbackDO);
if(eldersAuthFeedbackDAO.insert(eldersAuthFeedbackDO)>0){
return R.ok();
--
Gitblit v1.7.1