Commit 0b02f7c3 authored by 韩桐桐's avatar 韩桐桐

fix(jg):车用气瓶数据查询兼容个人

parent 59f7ab95
...@@ -126,8 +126,13 @@ public class JgVehicleInformationController extends BaseController { ...@@ -126,8 +126,13 @@ public class JgVehicleInformationController extends BaseController {
@RequestParam(value = "size") int size) { @RequestParam(value = "size") int size) {
Page<Map<String, Object>> page = new Page<>(current, size); Page<Map<String, Object>> page = new Page<>(current, size);
ReginParams info = getSelectedOrgInfo(); ReginParams info = getSelectedOrgInfo();
String companyCode = info.getCompany().getCompanyCode();
// 使用单位为个人时候 特殊处理
if (companyCode.split("_").length > 1) {
companyCode = companyCode.split("_")[1];
}
dto.setCurrentUserId(info.getUserModel().getUserId()); dto.setCurrentUserId(info.getUserModel().getUserId());
dto.setUseUnitCreditCode(info.getCompany().getCompanyCode()); dto.setUseUnitCreditCode(companyCode);
if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) { if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
dto.setDataType(BaseController.COMPANY_TYPE_COMPANY); dto.setDataType(BaseController.COMPANY_TYPE_COMPANY);
} else { } else {
......
...@@ -176,8 +176,14 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform ...@@ -176,8 +176,14 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
} }
// 使用单位信息 // 使用单位信息
vehicleInfoDto.setUseUnitName(company.getCompanyName()); if("个人主体".equals(company.getCompanyType())){
vehicleInfoDto.setUseUnitCreditCode(company.getCompanyCode()); vehicleInfoDto.setUseUnitName(company.getCompanyName().split("_")[1]);
vehicleInfoDto.setUseUnitCreditCode(company.getCompanyCode().split("_")[1]);
}else {
vehicleInfoDto.setUseUnitName(company.getCompanyName());
vehicleInfoDto.setUseUnitCreditCode(company.getCompanyCode());
}
// 接收单位信息 // 接收单位信息
if (!StringUtils.isEmpty(vehicleInfoDto.getReceiveOrgCode())) { if (!StringUtils.isEmpty(vehicleInfoDto.getReceiveOrgCode())) {
......
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