diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/RatioConfigController.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/RatioConfigController.java
index 12332941..bb2b8075 100644
--- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/RatioConfigController.java
+++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/RatioConfigController.java
@@ -71,31 +71,35 @@ public class RatioConfigController extends ControllerBase {
         TargetUserVO vo = new TargetUserVO();
         if (isMarketingDirector) {
             List<QuotationModelRatioAgentItemDTO> agentItems = ratioAgentItemService.getEffectives();
-            vo.setAppUsers(
-                    appUserService.lambdaQuery()
-                            .in(AppUser::getId, agentItems.stream().map(QuotationModelRatioAgentItemDTO::getUserId).collect(Collectors.toList()))
-                            .list()
-                            .stream()
-                            .map(u -> new TargetUserItemVO()
-                                    .setUserType(1)
-                                    .setUserId(u.getId())
-                                    .setUserName(u.getName())
-                            )
-                            .collect(Collectors.toList())
-            );
+            if (CollectionUtil.isNotEmpty(agentItems)) {
+                vo.setAppUsers(
+                        appUserService.lambdaQuery()
+                                .in(AppUser::getId, agentItems.stream().map(QuotationModelRatioAgentItemDTO::getUserId).collect(Collectors.toList()))
+                                .list()
+                                .stream()
+                                .map(u -> new TargetUserItemVO()
+                                        .setUserType(1)
+                                        .setUserId(u.getId())
+                                        .setUserName(u.getName())
+                                )
+                                .collect(Collectors.toList())
+                );
+            }
             List<QuotationModelRatioDirectItemDTO> directItems = ratioDirectItemService.getEffectives();
-            vo.setAdminUsers(
-                    adminUserService.lambdaQuery()
-                            .in(AdminUser::getId, directItems.stream().map(QuotationModelRatioDirectItemDTO::getUserId).collect(Collectors.toList()))
-                            .list()
-                            .stream()
-                            .map(u -> new TargetUserItemVO()
-                                    .setUserType(0)
-                                    .setUserId(u.getId())
-                                    .setUserName(u.getUserName())
-                            )
-                            .collect(Collectors.toList())
-            );
+            if (CollectionUtil.isNotEmpty(directItems)) {
+                vo.setAdminUsers(
+                        adminUserService.lambdaQuery()
+                                .in(AdminUser::getId, directItems.stream().map(QuotationModelRatioDirectItemDTO::getUserId).collect(Collectors.toList()))
+                                .list()
+                                .stream()
+                                .map(u -> new TargetUserItemVO()
+                                        .setUserType(0)
+                                        .setUserId(u.getId())
+                                        .setUserName(u.getUserName())
+                                )
+                                .collect(Collectors.toList())
+                );
+            }
         }
         return ApiResult.success(vo);
     }
diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java
index 1fe69b5e..cd1bd81a 100644
--- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java
+++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java
@@ -212,7 +212,7 @@ public class ShoppingController extends ControllerBase {
         vo.setDiscount(vo.getTotalFee().subtract(vo.getActualFee()));
         log.debug("机型【{}】价格为{},优惠{}", request.getModelNo(), vo.getActualFee(), vo.getDiscount());
         //获取部件配置
-        List<ModelConfigEffectiveDTO> parts = modelConfigService.getEffectives(modelPrice.getPriceId(), categoryId, MultilingualUtil.getLanguage());
+        List<ModelConfigEffectiveDTO> parts = modelConfigService.getEffectives(modelPrice.getConfigId(),modelPrice.getPriceId(), categoryId, MultilingualUtil.getLanguage());
         VUtils.trueThrowBusinessError(CollectionUtil.isEmpty(parts)).throwMessage("未获取到部件信息");
         vo.setStandardParts(parts.stream()
                 .filter(part -> part.getParentId() == 0L && part.getType() == 1)
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelConfigMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelConfigMapper.java
index 2dfbee16..20868526 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelConfigMapper.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelConfigMapper.java
@@ -23,5 +23,5 @@ public interface QuotationModelConfigMapper extends BaseMapper<QuotationModelCon
 
     IPage<ModelConfigVO> search(ModelConfigSearchRequest request, Page<?> objectPage);
 
-    List<ModelConfigEffectiveDTO> getEffectives(Long priceId, Long categoryId, String language);
+    List<ModelConfigEffectiveDTO> getEffectives(Long configId,Long priceId, Long categoryId, String language);
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelConfigService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelConfigService.java
index dade5ac1..46a1e45d 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelConfigService.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelConfigService.java
@@ -22,5 +22,5 @@ public interface IQuotationModelConfigService extends IService<QuotationModelCon
 
     IPage<ModelConfigVO> search(ModelConfigSearchRequest request);
 
-    List<ModelConfigEffectiveDTO> getEffectives(Long priceId, Long categoryId, String language);
+    List<ModelConfigEffectiveDTO> getEffectives(Long configId,Long priceId, Long categoryId, String language);
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelConfigServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelConfigServiceImpl.java
index 3dbe198c..b3a6edcb 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelConfigServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelConfigServiceImpl.java
@@ -31,7 +31,7 @@ public class QuotationModelConfigServiceImpl extends ServiceImpl<QuotationModelC
     }
 
     @Override
-    public List<ModelConfigEffectiveDTO> getEffectives(Long priceId, Long categoryId, String language) {
-        return baseMapper.getEffectives(priceId,categoryId,language);
+    public List<ModelConfigEffectiveDTO> getEffectives(Long configId,Long priceId, Long categoryId, String language) {
+        return baseMapper.getEffectives(configId,priceId,categoryId,language);
     }
 }
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelConfigMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelConfigMapper.xml
index 295a96bd..1849d89d 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelConfigMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelConfigMapper.xml
@@ -28,13 +28,17 @@
     </select>
 
     <select id="getEffectives" resultType="com.nflg.mobilebroken.common.pojo.dto.ModelConfigEffectiveDTO">
-        SELECT qmci.id,qmci.parent_id,qmcil.part_name,qmcil.part_remark,qmci.image_url,qmpia.amount,qmci.type,qmci.optional_type
-        FROM quotation_model_price qmp
-        INNER JOIN quotation_model_price_item qmpi ON qmpi.price_id=qmp.id
-        INNER JOIN quotation_model_config_item qmci ON qmci.unique_id=qmpi.config_item_unique_id
-        INNER JOIN quotation_model_config_item_language qmcil ON qmcil.config_item_id=qmci.id
-        INNER JOIN `language` l ON l.id=qmcil.language_id
-        INNER JOIN quotation_model_price_item_area qmpia ON qmpia.price_item_id=qmpi.id
-        WHERE qmp.id=#{priceId} AND l.`code`=#{language} AND qmpia.area_id=#{categoryId}
+        SELECT qmci.id,qmci.parent_id,qmcil.part_name,qmcil.part_remark,qmci.image_url,pp.amount,qmci.type,qmci.optional_type
+        FROM quotation_model_config_item qmci
+        LEFT JOIN quotation_model_config_item_language qmcil ON qmcil.config_item_id=qmci.id
+        LEFT JOIN `language` l ON l.id=qmcil.language_id
+        LEFT JOIN
+        (
+            SELECT qmpi.config_item_unique_id,qmpia.amount
+            FROM quotation_model_price_item qmpi
+            LEFT JOIN quotation_model_price_item_area qmpia ON qmpia.price_item_id=qmpi.id
+            WHERE qmpia.price_id=#{priceId} AND qmpia.area_id=#{categoryId}
+        ) pp ON qmci.unique_id=pp.config_item_unique_id
+        WHERE qmci.`enable` AND qmci.config_id=#{configId} AND l.`code`=#{language}
     </select>
 </mapper>