bug
parent
95989f88d3
commit
6a14912922
|
|
@ -168,8 +168,10 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi {
|
||||||
public SingleResponse<OrgPersonnelCO> get(Long id) {
|
public SingleResponse<OrgPersonnelCO> get(Long id) {
|
||||||
OrgPersonnelEntity entity = orgPersonnelDomainService.get(id);
|
OrgPersonnelEntity entity = orgPersonnelDomainService.get(id);
|
||||||
OrgPersonnelCO co = orgPersonnelConvertor.toCO(entity);
|
OrgPersonnelCO co = orgPersonnelConvertor.toCO(entity);
|
||||||
for (TitleCodeCo titleCodeCo : co.getTitleCodeArr()) {
|
if (co.getTitleCodeArr() != null) {
|
||||||
titleCodeCo.setIndustryCode(null);
|
for (TitleCodeCo titleCodeCo : co.getTitleCodeArr()) {
|
||||||
|
titleCodeCo.setIndustryCode(null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
fillWorkDateAge(co);
|
fillWorkDateAge(co);
|
||||||
enrich(co);
|
enrich(co);
|
||||||
|
|
@ -255,7 +257,9 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi {
|
||||||
List<OrgPersonnelCO> records = pageResult.getRecords().stream()
|
List<OrgPersonnelCO> records = pageResult.getRecords().stream()
|
||||||
.map(item -> {
|
.map(item -> {
|
||||||
OrgPersonnelCO co = orgPersonnelConvertor.toCO(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;
|
return co;
|
||||||
})
|
})
|
||||||
.collect(java.util.stream.Collectors.toList());
|
.collect(java.util.stream.Collectors.toList());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue