From d465503f58756b5c80901eb71bdb57aff9879159 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 9 Jun 2022 10:33:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcCommunitySelfOrganizationServiceImpl.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
index 5bc83dcfd9..cb063772c0 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
@@ -182,7 +182,6 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         orgEntity.setCustomerId(customerId);
         orgEntity.setOrgId(staffInfo.getAgencyId());
         orgEntity.setOrgType(IcCommunitySelfOrganizationConstant.ORG_TYPE_AGENCY);
-        orgEntity.setOrganizationCreatedTime(DateUtils.parse(formDTO.getOrganizationCreatedTime(), DATE_PATTERN));
         AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
         if (null == agencyInfo){
             throw new RenException(String.format("查询组织信息失败%s",staffInfo.getAgencyId()));
@@ -190,11 +189,13 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         orgEntity.setPid(agencyInfo.getPid());
         orgEntity.setPids(agencyInfo.getPids());
         // 保持时间统一
-        if (null == formDTO.getOrganizationCreatedTime()){
+        if (StringUtils.isBlank(formDTO.getOrganizationCreatedTime())){
             Date date = new Date();
             orgEntity.setOrganizationCreatedTime(date);
             orgEntity.setCreatedTime(date);
             orgEntity.setUpdatedTime(date);
+        }else{
+            orgEntity.setOrganizationCreatedTime(DateUtils.parse(formDTO.getOrganizationCreatedTime(), DATE_PATTERN));
         }
         baseDao.insert(orgEntity);
         if(CollectionUtils.isNotEmpty(formDTO.getOrganizationPersonnel())){