From 529bc51db74f9f5627aecc66c7acc8faae78f973 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期三, 09 十一月 2022 13:46:31 +0800
Subject: [PATCH] #feat 自提点社区id修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java
index 3f5e80c..fb4ef7c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java
@@ -65,8 +65,13 @@
     public R addPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO) {
         ConvenientElevatingPointDO convenientElevatingPointDO = new ConvenientElevatingPointDO();
         BeanUtils.copyProperties(convenientElevatingPointDTO,convenientElevatingPointDO);
-        ComActDO comActDO = comActDAO.selectById(convenientElevatingPointDTO.getCommunityId());
-        convenientElevatingPointDO.setCommunityName(comActDO.getName());
+        String communityId = convenientElevatingPointDTO.getCommunityId();
+        if (nonNull(communityId)) {
+            ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(","))));
+            if(comActDO!=null){
+                convenientElevatingPointDO.setCommunityName(comActDO.getName());
+            }
+        }
         this.baseMapper.insert(convenientElevatingPointDO);
         return R.ok();
     }
@@ -84,13 +89,11 @@
         if (isNull(convenientElevatingPointDO)) {
             return R.fail("自提点不存在");
         }
-        Long communityId = convenientElevatingPointDTO.getCommunityId();
+        String communityId = convenientElevatingPointDTO.getCommunityId();
         if (nonNull(communityId)) {
-            ComActDO comActDO = comActDAO.selectById(communityId);
+            ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(","))));
             if(comActDO!=null){
                 convenientElevatingPointDO.setCommunityName(comActDO.getName());
-            } else {
-                convenientElevatingPointDO.setCommunityName("西区社区");
             }
         }
         BeanUtils.copyProperties(convenientElevatingPointDTO, convenientElevatingPointDO);

--
Gitblit v1.7.1