Commit 9bd51e02 authored by hcing's avatar hcing

fix(tcm):风险报送bugfix

parent e5058279
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
-- 报送单位 -- 报送单位
<include refid="baseSelectForRiskReport"/> <include refid="baseSelectForRiskReport"/>
FROM tzs_risk_report AS rr2 FROM tzs_risk_report AS rr2
WHERE rr2."report_company_code" = #{dto.reportCompanyCode} AND rr2."current_status" != '草稿' WHERE rr2."report_user_id" = #{dto.reportUserId} AND rr2."current_status" != '草稿'
<!-- 处置单位 --> <!-- 处置单位 -->
<if test='dto.unitType != null and dto.unitType != "" and dto.unitType == "supervision"'> <if test='dto.unitType != null and dto.unitType != "" and dto.unitType == "supervision"'>
......
...@@ -149,11 +149,13 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R ...@@ -149,11 +149,13 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
CompanyBo company = getSelectedOrgInfo().getCompany(); CompanyBo company = getSelectedOrgInfo().getCompany();
AgencyUserModel userModel = getSelectedOrgInfo().getUserModel();
if (company.getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) { if (company.getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
reportDto.setUnitType(BaseController.COMPANY_TYPE_COMPANY); reportDto.setUnitType(BaseController.COMPANY_TYPE_COMPANY);
} else { } else {
reportDto.setUnitType(BaseController.COMPANY_TYPE_SUPERVISION); reportDto.setUnitType(BaseController.COMPANY_TYPE_SUPERVISION);
} }
reportDto.setReportUserId(userModel.getUserId());
reportDto.setReportCompanyCode(company.getCompanyCode()); reportDto.setReportCompanyCode(company.getCompanyCode());
reportDto.setRiskCompanyCode(company.getCompanyCode()); reportDto.setRiskCompanyCode(company.getCompanyCode());
reportDto.setRiskDisposalUnitOrgCode(company.getOrgCode()); reportDto.setRiskDisposalUnitOrgCode(company.getOrgCode());
......
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