|
|
@ -558,7 +558,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa |
|
|
|
List<MoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(appModelConfigListVo.getModelSid(), appModelConfigListVo.getConfigSid(), orgSid, VehicleState.LockEnum.UN_LOCK.getCode()); |
|
|
|
for (MoreConfigVo moreConfigVo : moreConfigVos) { |
|
|
|
String sid = moreConfigVo.getUseOrgSid(); |
|
|
|
if(StringUtils.isNotBlank(sid)){ |
|
|
|
if (StringUtils.isNotBlank(sid)) { |
|
|
|
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(sid).getData(); |
|
|
|
moreConfigVo.setCompanyName(sysOrganization.getName()); |
|
|
|
} |
|
|
@ -755,9 +755,12 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa |
|
|
|
if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getSpecification())) {//驾驶室
|
|
|
|
qw.eq("bmc.specification", pagerQuery.getSpecification()); |
|
|
|
} |
|
|
|
if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getRearAxleRatio())) {//后桥速比
|
|
|
|
if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getRearAxleRatio())) {//速比
|
|
|
|
qw.eq("bmc.rearAxleRatio", pagerQuery.getRearAxleRatio()); |
|
|
|
} |
|
|
|
if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getRearAxleValue())) {//后桥
|
|
|
|
qw.eq("bmc.rearAxleValue", pagerQuery.getRearAxleValue()); |
|
|
|
} |
|
|
|
if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getAirConditioner())) {//空调
|
|
|
|
qw.eq("bmc.airConditioner", pagerQuery.getAirConditioner()); |
|
|
|
} |
|
|
@ -844,7 +847,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa |
|
|
|
List<MoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(appModelConfigListVo.getModelSid(), appModelConfigListVo.getConfigSid(), orgSid, VehicleState.LockEnum.UN_LOCK.getCode()); |
|
|
|
for (MoreConfigVo moreConfigVo : moreConfigVos) { |
|
|
|
String sid = moreConfigVo.getUseOrgSid(); |
|
|
|
if(StringUtils.isNotBlank(sid)){ |
|
|
|
if (StringUtils.isNotBlank(sid)) { |
|
|
|
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(sid).getData(); |
|
|
|
moreConfigVo.setCompanyName(sysOrganization.getName()); |
|
|
|
} |
|
|
|