社区自组织创建时间

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())){