From 71a120a03800d1dee302cfb29a913d96b658e43d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 09 五月 2022 14:27:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng' into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java
index 7c83fe2..bf67438 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java
@@ -32,6 +32,7 @@
import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotEmpty;
import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNull;
+import static org.apache.commons.lang3.StringUtils.isBlank;
/**
* (ComActAcidRecord)表服务实现类
@@ -238,6 +239,19 @@
public R updateLocalCity(ComActAcidRecordVO comActAcidRecordVO) {
ComActAcidRecord comActAcidRecord = new ComActAcidRecord();
BeanUtils.copyProperties(comActAcidRecordVO, comActAcidRecord);
+ String idCard = comActAcidRecordVO.getIdCard();
+ if (isBlank(idCard)) {
+ //只修改地址，其他信息需要查询
+ ComActAcidRecord comActAcidRecord1 = this.baseMapper.selectById(comActAcidRecordVO.getId());
+ if (isNull(comActAcidRecord1)) {
+ return R.fail("填报纪录不存在");
+ }
+ String localCity = comActAcidRecordVO.getLocalCity();
+ String localAddress = comActAcidRecordVO.getLocalAddress();
+ BeanUtils.copyProperties(comActAcidRecord1, comActAcidRecordVO);
+ comActAcidRecordVO.setLocalCity(localCity);
+ comActAcidRecordVO.setLocalAddress(localAddress);
+ }
ComActAcidDangerMember comActAcidDangerMember =
comActAcidDangerMemberDao.selectOne(new QueryWrapper<ComActAcidDangerMember>().lambda()
.eq(ComActAcidDangerMember::getRecordId, comActAcidRecordVO.getId()));
--
Gitblit v1.7.1