问题修改

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")

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<BaseVehicleModel
         IPage<BaseVehicleModelVo> baseVehicleModelVo  = new Page<>();
         BaseVehicleModelQuery params = pagerQuery.getParams();
         IPage<BaseVehicleModelQuery> page = PagerUtil.queryToPage(pagerQuery);
-        QueryWrapper<BaseVehicleModelVo> qw = buildQueryWrapper(params);
-        List<BaseVehmodelConfigVo> baseVehmodelConfigVos = baseVehmodelConfigService.getListByConfigSid(params.getConfigSid());
+        List<BaseVehmodelConfigVo> baseVehmodelConfigVos = baseVehmodelConfigService.getListByConfigSidAndUseOrgSid(params.getConfigSid(),params.getCreateOrgSId());
         for (BaseVehmodelConfigVo baseVehmodelConfigVo : baseVehmodelConfigVos) {
             String modelSid = baseVehmodelConfigVo.getModelSid();
             params.setModelSid(modelSid);
+            QueryWrapper<BaseVehicleModelVo> qw = buildQueryWrapper(params);
             IPage<BaseVehicleModelVo> baseVehicleModelVoIPage = baseMapper.pagerList(page, qw);
             List<BaseVehicleModelVo> records = baseVehicleModelVoIPage.getRecords();
             for (BaseVehicleModelVo record : records) {

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<BaseVehmodelConfig>
     int checkByConfigSid(String sid);
 
     int checkByModelSid(String sid);
+
+    List<BaseVehmodelConfigVo> getListByConfigSidAndUseOrgSid(@Param("configSid") String configSid,@Param("createOrgSId") String createOrgSId);
 }

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
     </select>
+
+    <select id="getListByConfigSidAndUseOrgSid"
+            resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
+        SELECT *
+        FROM base_vehmodel_config
+        WHERE configurationItemsSid = #{configSid}
+        AND useOrgSid = #{createOrgSId}
+    </select>
 </mapper>

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<BaseVehmodelCo
             qw.eq("bvc.modelSid", query.getModelSid());
         }
         if (StringUtils.isNotBlank(query.getUseOrgSid())) {
-            qw.eq("bvm.useOrgSid", query.getUseOrgSid());
+            qw.eq("bvc.useOrgSid", query.getUseOrgSid());
         }
         if (StringUtils.isNotBlank(query.getCarColorKey())) {//车身颜色
             qw.like("bmc.carColorKey", query.getCarColorKey());
@@ -551,4 +551,8 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
     public int checkByModelSid(String sid) {
         return baseMapper.checkByModelSid(sid);
     }
+
+    public List<BaseVehmodelConfigVo> getListByConfigSidAndUseOrgSid(String configSid, String createOrgSId) {
+        return baseMapper.getListByConfigSidAndUseOrgSid(configSid,createOrgSId);
+    }
 }