Merge remote-tracking branch 'origin/dev-tmp1' into dev-tmp1
commit
1abec00b36
|
|
@ -21,7 +21,6 @@ import org.qinan.safetyeval.domain.constant.CertTypeCodeEnum;
|
|||
import org.qinan.safetyeval.domain.entity.OrgPersonnelCertEntity;
|
||||
import org.qinan.safetyeval.domain.entity.OrgPersonnelEntity;
|
||||
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.ErrorCode;
|
||||
import org.qinan.safetyeval.domain.gateway.FaceCompareGateway;
|
||||
|
|
@ -168,9 +167,6 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi {
|
|||
public SingleResponse<OrgPersonnelCO> get(Long id) {
|
||||
OrgPersonnelEntity entity = orgPersonnelDomainService.get(id);
|
||||
OrgPersonnelCO co = orgPersonnelConvertor.toCO(entity);
|
||||
for (TitleCodeCo titleCodeCo : co.getTitleCodeArr()) {
|
||||
titleCodeCo.setIndustryCode(null);
|
||||
}
|
||||
fillWorkDateAge(co);
|
||||
enrich(co);
|
||||
fillCerts(co, id);
|
||||
|
|
@ -253,11 +249,7 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi {
|
|||
PageResult<OrgPersonnelEntity> pageResult = orgPersonnelDomainService.page(domainQuery);
|
||||
|
||||
List<OrgPersonnelCO> records = pageResult.getRecords().stream()
|
||||
.map(item -> {
|
||||
OrgPersonnelCO co = orgPersonnelConvertor.toCO(item);
|
||||
co.getTitleCodeArr().forEach(v -> v.setIndustryCode(null));
|
||||
return co;
|
||||
})
|
||||
.map(item -> orgPersonnelConvertor.toCO(item))
|
||||
.collect(java.util.stream.Collectors.toList());
|
||||
if (orgPersonnelViewEnricher != null) {
|
||||
orgPersonnelViewEnricher.enrichPersonnelBatch(records);
|
||||
|
|
|
|||
Loading…
Reference in New Issue