From 10c27ab0aac1816cde172496b8126edd26a8d1ac Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 11 十一月 2021 14:57:42 +0800
Subject: [PATCH] Merge branch 'zhaozhengjie1104' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java  |    2 ++
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java   |    9 +++++++--
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java |    2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java
index a10f749..0f99651 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java
@@ -632,11 +632,13 @@
                         comMngPopulationDAO.updateById(comMngPopulationDO);
                         comElderAuthElderliesDO.setAddress(comElderAuthRecordVO.getAddress());
                         comElderAuthElderliesDO.setPhone(comElderAuthRecordVO.getPhone());
+                        comElderAuthElderliesDO.setIdCard(null);
                         comElderAuthElderliesDAO.updateById(comElderAuthElderliesDO);
                         ComPensionAuthPensionerDO comPensionAuthPensionerDO=comPensionAuthPensionerDAO.selectOne(new QueryWrapper<ComPensionAuthPensionerDO>().lambda().eq(ComPensionAuthPensionerDO::getPopulationId,comMngPopulationDO.getId()));
                         if(comPensionAuthPensionerDO!=null){
                             comPensionAuthPensionerDO.setAddress(comElderAuthRecordVO.getAddress());
                             comPensionAuthPensionerDO.setPhone(comElderAuthRecordVO.getPhone());
+                            comPensionAuthPensionerDO.setIdCard(null);
                             comPensionAuthPensionerDAO.updateById(comPensionAuthPensionerDO);
                         }
                         return R.ok();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java
index 5b26cb5..5c41840 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java
@@ -558,11 +558,13 @@
                        comMngPopulationDAO.updateById(comMngPopulationDO);
                        comPensionAuthPensionerDO.setAddress(comElderAuthRecordVO.getAddress());
                        comPensionAuthPensionerDO.setPhone(comElderAuthRecordVO.getPhone());
+                       comPensionAuthPensionerDO.setIdCard(null);
                        comPensionAuthPensionerDAO.updateById(comPensionAuthPensionerDO);
                        ComElderAuthElderliesDO comElderAuthElderliesDO=comElderAuthElderliesDAO.selectOne(new QueryWrapper<ComElderAuthElderliesDO>().lambda().eq(ComElderAuthElderliesDO::getPopulationId,comMngPopulationDO.getId()));
                        if(comElderAuthElderliesDO!=null){
                            comElderAuthElderliesDO.setAddress(comElderAuthRecordVO.getAddress());
                            comElderAuthElderliesDO.setPhone(comElderAuthRecordVO.getPhone());
+                           comElderAuthElderliesDO.setIdCard(null);
                            comElderAuthElderliesDAO.updateById(comElderAuthElderliesDO);
                        }
                        return R.ok();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
index 1487dd1..2e4a78b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
@@ -83,11 +83,16 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R addMerchant(ConvenientMerchantDTO convenientMerchantDTO) {
-        ComActDO comActDO = comActDAO.selectById(convenientMerchantDTO.getCommunityId());
         ConvenientMerchantDO convenientMerchantDO = new ConvenientMerchantDO();
         BeanUtils.copyProperties(convenientMerchantDTO, convenientMerchantDO);
+        if(convenientMerchantDTO.getCommunityId()==0){
+            convenientMerchantDO.setCommunityName("西区社区");
+        }
+        else {
+            ComActDO comActDO = comActDAO.selectById(convenientMerchantDTO.getCommunityId());
+            convenientMerchantDO.setCommunityName(comActDO.getName());
+        }
         convenientMerchantDO.setUserId(0L);
-        convenientMerchantDO.setCommunityName(comActDO.getName());
         convenientMerchantDO.setCreatedAt(new Date());
         int insertResult = this.baseMapper.insert(convenientMerchantDO);
         if (insertResult > 0) {

--
Gitblit v1.7.1