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 cb063772c0..698045aa65 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
@@ -534,19 +534,19 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                     //社会自组织名称重复
                     communitySeltOrgList.forEach(org -> {
                         if (obj.getOrganizationName().equals(org.getOrganizationName())) {
-                            log.warn(String.format("当前客户下的社会自组织名称已存在,社会自组织名称->%s,行号->%s", obj.getOrganizationName(), obj.getRowNum()));
-                            errMsg.append("客户下社会自组织名称已存在;");
+                            log.warn(String.format("当前客户下的社区自组织名称已存在,社会自组织名称->%s,行号->%s", obj.getOrganizationName(), obj.getRowNum()));
+                            errMsg.append("客户下社区自组织名称已存在;");
                             bl.set(true);
                         }
                     });
-                    //手机号不合规
-                    boolean m = PhoneValidatorUtils.isMobile(obj.getPrincipalPhone());
-                    boolean t = PhoneValidatorUtils.isTel(obj.getPrincipalPhone());
-                    if (!m && !t){
-                        errMsg.append("手机号码不合法;");
-                        bl.set(true);
-                        log.warn("手机号码不合法,自组织名称{}", obj.getOrganizationName());
-                    }
+                    // //手机号不合规
+                    // boolean m = PhoneValidatorUtils.isMobile(obj.getPrincipalPhone());
+                    // boolean t = PhoneValidatorUtils.isTel(obj.getPrincipalPhone());
+                    // if (!m && !t){
+                    //     errMsg.append("手机号码不合法;");
+                    //     bl.set(true);
+                    //     log.warn("手机号码不合法,自组织名称{}", obj.getOrganizationName());
+                    // }
                     if(bl.get()){
                         excel = new CommunitySelfOrgImportExcel();
                         //excel.setAgencyName(obj.getOrganizationName());
@@ -565,12 +565,15 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                     e.setOrgType(IcCommunitySelfOrganizationConstant.ORG_TYPE_AGENCY);
                     e.setPid(agencyInfo.getPid());
                     e.setPids(agencyInfo.getPids());
-                    e.setOrganizationCreatedTime(DateUtils.parse(l.getOrganizationCreatedTime(), DATE_PATTERN));
+                    e.setOrganizationCreatedTime(StringUtils.isNotBlank(l.getOrganizationCreatedTime()) ? DateUtils.parse(l.getOrganizationCreatedTime(), DATE_PATTERN) : new Date());
                     //赋值分类编码，excel输入的是分类名称，需要找到admin字典库中的key
                     for (String key : categoryMap.keySet()) {
+                        log.info("*******key="+key+";categoryMap.get(key)="+categoryMap.get(key)+";e.getCategoryCode()="+e.getCategoryCode());
                         if (StringUtils.isNotBlank(categoryMap.get(key)) && categoryMap.get(key).equals(e.getCategoryCode())) {
-                            e.setCategoryCode(categoryMap.get(key));
+                            e.setCategoryCode(key);
                             break;
+                        }else{
+                            e.setCategoryCode(StrConstant.EPMETY_STR);
                         }
                     }
                     List<IcCommunitySelfOrganizationPersonnelEntity> persons = new ArrayList<>();
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/self_org_import_template.xlsx b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/self_org_import_template.xlsx
index 0f67e0f0e1..6f5622382d 100644
Binary files a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/self_org_import_template.xlsx and b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/self_org_import_template.xlsx differ