bug
parent
6a14912922
commit
0a352d220f
|
|
@ -21,7 +21,6 @@ import org.qinan.safetyeval.domain.constant.CertTypeCodeEnum;
|
||||||
import org.qinan.safetyeval.domain.entity.OrgPersonnelCertEntity;
|
import org.qinan.safetyeval.domain.entity.OrgPersonnelCertEntity;
|
||||||
import org.qinan.safetyeval.domain.entity.OrgPersonnelEntity;
|
import org.qinan.safetyeval.domain.entity.OrgPersonnelEntity;
|
||||||
import org.qinan.safetyeval.domain.entity.OrgPositionEntity;
|
import org.qinan.safetyeval.domain.entity.OrgPositionEntity;
|
||||||
import org.qinan.safetyeval.domain.entity.TitleCodeCo;
|
|
||||||
import org.qinan.safetyeval.domain.exception.BizException;
|
import org.qinan.safetyeval.domain.exception.BizException;
|
||||||
import org.qinan.safetyeval.domain.exception.ErrorCode;
|
import org.qinan.safetyeval.domain.exception.ErrorCode;
|
||||||
import org.qinan.safetyeval.domain.gateway.FaceCompareGateway;
|
import org.qinan.safetyeval.domain.gateway.FaceCompareGateway;
|
||||||
|
|
@ -168,11 +167,6 @@ 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);
|
||||||
if (co.getTitleCodeArr() != null) {
|
|
||||||
for (TitleCodeCo titleCodeCo : co.getTitleCodeArr()) {
|
|
||||||
titleCodeCo.setIndustryCode(null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
fillWorkDateAge(co);
|
fillWorkDateAge(co);
|
||||||
enrich(co);
|
enrich(co);
|
||||||
fillCerts(co, id);
|
fillCerts(co, id);
|
||||||
|
|
@ -255,13 +249,7 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi {
|
||||||
PageResult<OrgPersonnelEntity> pageResult = orgPersonnelDomainService.page(domainQuery);
|
PageResult<OrgPersonnelEntity> pageResult = orgPersonnelDomainService.page(domainQuery);
|
||||||
|
|
||||||
List<OrgPersonnelCO> records = pageResult.getRecords().stream()
|
List<OrgPersonnelCO> records = pageResult.getRecords().stream()
|
||||||
.map(item -> {
|
.map(item -> orgPersonnelConvertor.toCO(item))
|
||||||
OrgPersonnelCO co = orgPersonnelConvertor.toCO(item);
|
|
||||||
if (co.getTitleCodeArr() != null) {
|
|
||||||
co.getTitleCodeArr().forEach(v -> v.setIndustryCode(null));
|
|
||||||
}
|
|
||||||
return co;
|
|
||||||
})
|
|
||||||
.collect(java.util.stream.Collectors.toList());
|
.collect(java.util.stream.Collectors.toList());
|
||||||
if (orgPersonnelViewEnricher != null) {
|
if (orgPersonnelViewEnricher != null) {
|
||||||
orgPersonnelViewEnricher.enrichPersonnelBatch(records);
|
orgPersonnelViewEnricher.enrichPersonnelBatch(records);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue