From 0c5c4cd98f86712db9783f15d24e0f06765afaa8 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 24 Apr 2023 10:55:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E8=80=81=E7=9A=84=E4=BA=BA=E7=BE=A4=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LingShanSpecialCrowdServiceImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java index c907a727c3..1f3c3a6b83 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java +++ b/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 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 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));