1.修改：兼容老的人群类型

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java

@@ -42,6 +42,7 @@ import com.epmet.exceptions.ReadExcelHeaderOnlyException;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.OssFeignClient;
+import com.epmet.remote.EpmetUserRemoteService;
 import com.epmet.service.LingShanSpecialCrowdService;
 import com.epmet.utils.ImportTaskUtils;
 import com.github.pagehelper.PageHelper;
@@ -107,6 +108,9 @@ public class LingShanSpecialCrowdServiceImpl implements LingShanSpecialCrowdServ
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
 
+    @Autowired
+    private EpmetUserRemoteService epmetUserRemoteService;
+
     @Override
     public String importSpecialCrowd(String crowdCategory, String fileSavePath, String originFilename) {
         Class<? extends LingShanSpecialCrowdDetailBaseExcelData> excelDataClass;
@@ -607,6 +611,8 @@ public class LingShanSpecialCrowdServiceImpl implements LingShanSpecialCrowdServ
         String orgIdPath = null;
         if (StringUtils.isNotBlank(orgId)) {
             orgIdPath = CustomerOrgRedis.getOrgIdPath(orgId, orgType);
+        } else {
+             orgIdPath = epmetUserRemoteService.getLoginUserDetails().getOrgIdPath();
         }
         PageHelper.startPage(pageNo, pageSize);
         List<LingShanSpecialCrowdListResultDTO> l = icSpecialDao.listSpecialCrowd(orgIdPath, orgType, specialType, name, mobile, idCard);
@@ -623,7 +629,10 @@ public class LingShanSpecialCrowdServiceImpl implements LingShanSpecialCrowdServ
             if (StringUtils.isNotBlank(specialTypesStr)) {
                 String[] types = specialTypesStr.split(",");
                 for (String type : types) {
-                    typesDisplay.add(LingShanSpecialCrowdTypeEnums.getByType(type).getName());
+                    LingShanSpecialCrowdTypeEnums crowdType = LingShanSpecialCrowdTypeEnums.getByType(type);
+                    if (crowdType != null) {
+                        typesDisplay.add(crowdType.getName());
+                    }
                 }
             }
             i.setSpecialTypeDisplay(String.join(",", typesDisplay));