diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java index 394bdb0136..6fd392becc 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java @@ -25,6 +25,8 @@ public class BaseVehicleModelQuery implements Query { @ApiModelProperty(value = "常用配置sid") private String configSid; + @ApiModelProperty(value = "分公司sid") + private String createOrgSId; @ApiModelProperty(value = "车型sid") private String modelSid; @ApiModelProperty(value = "品牌sid") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java index 2142989b7a..d2b1062cc9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java @@ -616,11 +616,11 @@ public class BaseVehicleModelService extends MybatisBaseService baseVehicleModelVo = new Page<>(); BaseVehicleModelQuery params = pagerQuery.getParams(); IPage page = PagerUtil.queryToPage(pagerQuery); - QueryWrapper qw = buildQueryWrapper(params); - List baseVehmodelConfigVos = baseVehmodelConfigService.getListByConfigSid(params.getConfigSid()); + List baseVehmodelConfigVos = baseVehmodelConfigService.getListByConfigSidAndUseOrgSid(params.getConfigSid(),params.getCreateOrgSId()); for (BaseVehmodelConfigVo baseVehmodelConfigVo : baseVehmodelConfigVos) { String modelSid = baseVehmodelConfigVo.getModelSid(); params.setModelSid(modelSid); + QueryWrapper qw = buildQueryWrapper(params); IPage baseVehicleModelVoIPage = baseMapper.pagerList(page, qw); List records = baseVehicleModelVoIPage.getRecords(); for (BaseVehicleModelVo record : records) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java index 24ae332f6d..13864e4cc3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java @@ -128,4 +128,6 @@ public interface BaseVehmodelConfigMapper extends BaseMapper int checkByConfigSid(String sid); int checkByModelSid(String sid); + + List getListByConfigSidAndUseOrgSid(@Param("configSid") String configSid,@Param("createOrgSId") String createOrgSId); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml index c7fc58706d..e332d0c285 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml @@ -282,4 +282,12 @@ WHERE modelSid = #{sid} AND isDelete = 0 + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java index bd9ead36d1..a45ea81fee 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java @@ -102,7 +102,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService getListByConfigSidAndUseOrgSid(String configSid, String createOrgSId) { + return baseMapper.getListByConfigSidAndUseOrgSid(configSid,createOrgSId); + } } \ No newline at end of file