From 4feaef5e35f0dad7cc3f05e32fc7e3e52fa9396d Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 10 三月 2022 17:17:14 +0800
Subject: [PATCH] 随手拍/微心愿/志愿者修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 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 7b333ab..377e862 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
@@ -59,8 +59,10 @@
@Override
public R addVolunteer(ComMngVolunteerMngVO comMngVolunteerMngVO) {
String phone = comMngVolunteerMngVO.getPhone();
+ String idCard = comMngVolunteerMngVO.getIdCard();
Integer integer = comMngVolunteerMngDAO.selectCount(new QueryWrapper<ComMngVolunteerMngDO>().lambda()
- .eq(ComMngVolunteerMngDO::getPhone, phone).in(ComMngVolunteerMngDO::getState, Arrays.asList(1, 2)));
+ .and(wrapper -> wrapper.eq(ComMngVolunteerMngDO::getPhone, phone).or().eq(ComMngVolunteerMngDO::getIdCard, idCard))
+ .in(ComMngVolunteerMngDO::getState, Arrays.asList(1, 2)));
if (null != integer && integer.intValue() > 0) {
return R.fail("请勿重复申请");
}
@@ -171,12 +173,7 @@
*/
@Override
public R detailVolunteerExamine(Long id) {
- ComMngVolunteerMngDO comMngVolunteerMngDO = comMngVolunteerMngDAO.selectById(id);
- if (ObjectUtils.isEmpty(comMngVolunteerMngDO)) {
- return R.fail("审核不存在");
- }
- ComMngVolunteerMngVO comMngVolunteerMngVO = new ComMngVolunteerMngVO();
- BeanUtils.copyProperties(comMngVolunteerMngDO, comMngVolunteerMngVO);
+ ComMngVolunteerMngVO comMngVolunteerMngVO = comMngVolunteerMngDAO.detailVolunteerExamine(id);
// String phone = comMngVolunteerMngVO.getPhone();
// comMngVolunteerMngVO.setUserId(comMngVolunteerMngDAO.selectUserIdByPhone(phone));
return R.ok(comMngVolunteerMngVO);
--
Gitblit v1.7.1