未匹配到分类的默认是其他

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(categoryName)) {
-                        if (StringUtils.isNotBlank(categoryMap.get(key)) && categoryMap.get(key).equals(e.getCategoryCode())) {
                             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("");