diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java index a8c4453d..f6641847 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java @@ -168,8 +168,10 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi { public SingleResponse get(Long id) { OrgPersonnelEntity entity = orgPersonnelDomainService.get(id); OrgPersonnelCO co = orgPersonnelConvertor.toCO(entity); - for (TitleCodeCo titleCodeCo : co.getTitleCodeArr()) { - titleCodeCo.setIndustryCode(null); + if (co.getTitleCodeArr() != null) { + for (TitleCodeCo titleCodeCo : co.getTitleCodeArr()) { + titleCodeCo.setIndustryCode(null); + } } fillWorkDateAge(co); enrich(co); @@ -255,7 +257,9 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi { List records = pageResult.getRecords().stream() .map(item -> { OrgPersonnelCO co = orgPersonnelConvertor.toCO(item); - co.getTitleCodeArr().forEach(v -> v.setIndustryCode(null)); + if (co.getTitleCodeArr() != null) { + co.getTitleCodeArr().forEach(v -> v.setIndustryCode(null)); + } return co; }) .collect(java.util.stream.Collectors.toList());