From d83b37d059b288e0fd9dfe2e01ae1c84f9e85420 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 15 Jun 2022 10:56:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=8C=B9=E9=85=8D=E5=88=B0=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E7=9A=84=E9=BB=98=E8=AE=A4=E6=98=AF=E5=85=B6=E4=BB=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcCommunitySelfOrganizationServiceImpl.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 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 702125cd3d..52b11d72a1 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
@@ -578,15 +578,16 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                     e.setPids(agencyInfo.getPids());
                     e.setOrganizationCreatedTime(StringUtils.isNotBlank(l.getOrganizationCreatedTime()) ? DateUtils.stringToDate(l.getOrganizationCreatedTime(), DATE_PATTERN) : new Date());
                     //赋值分类编码，excel输入的是分类名称，需要找到admin字典库中的key
+                    String categoryName=l.getCategoryCode();
                     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())) {
+                        if (StringUtils.isNotBlank(categoryMap.get(key)) && categoryMap.get(key).equals(categoryName)) {
                             e.setCategoryCode(key);
-                            break;
-                        }else{
-                            e.setCategoryCode(StrConstant.EPMETY_STR);
                         }
                     }
+                    //未匹配到分类默认是其他
+                    if(categoryName.equals(e.getCategoryCode())){
+                        e.setCategoryCode(SelfOrgCategoryEnum.OTHER.getCode());
+                    }
                     List<IcCommunitySelfOrganizationPersonnelEntity> persons = new ArrayList<>();
                     AtomicReference<Boolean> bl = new AtomicReference<>(false);
                     StringBuffer msg = new StringBuffer("");