From b6082fe75b377ac9c177736d98f36ae46e7cdb70 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期三, 28 四月 2021 10:20:55 +0800
Subject: [PATCH] Merge branch 'master' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java
index cdc9006..191ca15 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java
@@ -62,7 +62,8 @@
*/
@Override
public R deleteVolunteer(ComMngVolunteerMngVO comMngVolunteerMngVO) {
- int delete = comMngVolunteerMngDAO.delete(new QueryWrapper<ComMngVolunteerMngDO>().lambda().eq(ComMngVolunteerMngDO::getPhone, comMngVolunteerMngVO.getPhone()));
+ ComMngVolunteerMngDO comMngVolunteerMngDO = comMngVolunteerMngDAO.selectById(comMngVolunteerMngVO.getId());
+ int delete = comMngVolunteerMngDAO.delete(new QueryWrapper<ComMngVolunteerMngDO>().lambda().eq(ComMngVolunteerMngDO::getId, comMngVolunteerMngDO.getId()));
if (delete>0) {
return R.ok();
}
@@ -149,8 +150,8 @@
}
ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO();
BeanUtils.copyProperties(comMngVolunteerMngDO,comMngVolunteerMngVO);
- String phone = comMngVolunteerMngVO.getPhone();
- comMngVolunteerMngVO.setUserId(comMngVolunteerMngDAO.selectUserIdByPhone(phone));
+ //String phone = comMngVolunteerMngVO.getPhone();
+ //comMngVolunteerMngVO.setUserId(comMngVolunteerMngDAO.selectUserIdByPhone(phone));
return R.ok(comMngVolunteerMngVO);
}
@@ -234,6 +235,11 @@
}
-
-
+ @Override
+ public R getVolunteerById(Long id) {
+ ComMngVolunteerMngDO comMngVolunteerMngDO = comMngVolunteerMngDAO.selectById(id);
+ ComMngVolunteerMngAppletsVO vo=new ComMngVolunteerMngAppletsVO();
+ BeanUtils.copyProperties(comMngVolunteerMngDO,vo);
+ return R.ok(vo);
+ }
}
--
Gitblit v1.7.1