Commit 356c1ed6 authored by hcing's avatar hcing

fix(tcm):报送bug

parent 8ec77984
......@@ -218,10 +218,10 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
private String buildAllRiskDisposalUnitOrgCode(String defaultOrgCode, Long sequenceNbr) {
if (!ObjectUtils.isEmpty(sequenceNbr)) {
String riskDisposalUnitOrgCode = riskReportMapper.getRiskDisposalUnitOrgCode(sequenceNbr);
if (!ObjectUtils.isEmpty(riskDisposalUnitOrgCode)) {
String allRiskDisposalUnitOrgCode = riskReportMapper.getRiskDisposalUnitOrgCode(sequenceNbr);
if (!ObjectUtils.isEmpty(allRiskDisposalUnitOrgCode)) {
return String.join(",", Stream.concat(
Arrays.stream(riskDisposalUnitOrgCode.split(",")),
Arrays.stream(allRiskDisposalUnitOrgCode.split(",")),
Stream.of(defaultOrgCode)
).collect(Collectors.toSet())
);
......@@ -370,7 +370,7 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
.operationCompanySeq(company.getSequenceNbr().toString())
.operationCompanyName(company.getCompanyName())
.operationUserId(userModel.getUserId())
.operationUserName(userModel.getUserName())
.operationUserName(userModel.getRealName())
.createDate(new Date())
.createUserId(userModel.getUserId())
.createUserName(userModel.getRealName())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment