fix: bug
parent
a7b7764283
commit
c45f5ce8b1
|
|
@ -21,6 +21,7 @@ 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;
|
||||||
|
|
@ -167,6 +168,9 @@ 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()) {
|
||||||
|
titleCodeCo.setIndustryCode(null);
|
||||||
|
}
|
||||||
fillWorkDateAge(co);
|
fillWorkDateAge(co);
|
||||||
enrich(co);
|
enrich(co);
|
||||||
fillCerts(co, id);
|
fillCerts(co, id);
|
||||||
|
|
@ -249,7 +253,11 @@ 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(orgPersonnelConvertor::toCO)
|
.map(item -> {
|
||||||
|
OrgPersonnelCO co = orgPersonnelConvertor.toCO(item);
|
||||||
|
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);
|
||||||
|
|
|
||||||
|
|
@ -22,4 +22,8 @@ public class TitleCodeCo implements Serializable {
|
||||||
|
|
||||||
/** 证明材料地址 */
|
/** 证明材料地址 */
|
||||||
private String proveUrl;
|
private String proveUrl;
|
||||||
|
/**
|
||||||
|
* 名称
|
||||||
|
*/
|
||||||
|
private String industryName;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue