From 4c84f9d32baeaa9942a4af74efce3d5b6297246d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 03 三月 2022 16:46:00 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java
index 6a1ca7c..5a36422 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java
@@ -23,6 +23,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -54,6 +55,7 @@
ComActSocialWorker comActSocialWorkerDO = new ComActSocialWorker();
BeanUtils.copyProperties(comActSocialWorkerAddDTO, comActSocialWorkerDO);
comActSocialWorkerDO.setCreateBy(comActSocialWorkerAddDTO.getUserId());
+ comActSocialWorkerDO.setCreateAt(new Date());
if(comActSocialWorkerMapper.insert(comActSocialWorkerDO)>0){
return R.ok();
}
@@ -109,14 +111,9 @@
* @return 查找结果
*/
@Override
- public R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(Long id){
- ComActSocialWorker comActSocialWorkerDO = comActSocialWorkerMapper.selectById(id);
- if(comActSocialWorkerDO!=null) {
- ComActSocialWorkerDetailsVO comActSocialWorkerDetailsVO = new ComActSocialWorkerDetailsVO();
- BeanUtils.copyProperties(comActSocialWorkerDO, comActSocialWorkerDetailsVO);
- return R.ok(comActSocialWorkerDetailsVO);
- }
- return R.fail();
+ public R<ComActSocialWorkerVO> comActSocialWorkerDetails(Long id){
+ ComActSocialWorkerVO comActSocialWorkerDO = comActSocialWorkerMapper.selectOneById(id);
+ return R.ok(comActSocialWorkerDO);
}
@Override
--
Gitblit v1.7.1