diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceMapper.java index 3f326c5b..1340f8a5 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceMapper.java @@ -47,5 +47,5 @@ public interface DeviceMapper extends BaseMapper { List getAgents(); - List getComponents1(String modelNo, String language); + List getComponents1(String productLine, String language); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceServiceImpl.java index aeb19adc..6ea40f1e 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceServiceImpl.java @@ -39,7 +39,7 @@ public class DeviceServiceImpl extends ServiceImpl impleme if (Objects.equals(vo.getType(), 0)) { vo.setComponents(baseMapper.getComponents(vo.getModelNo(), MultilingualUtil.getLanguage())); } else { - vo.setComponents(baseMapper.getComponents1(vo.getModelNo(), MultilingualUtil.getLanguage())); + vo.setComponents(baseMapper.getComponents1(vo.getProductLine(), MultilingualUtil.getLanguage())); } } return Optional.ofNullable(vo).orElse(new DeviceInfoVO()); diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml index ae46e199..238556f3 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml @@ -144,6 +144,6 @@ inner join gongfu_device_component dc ON dc.id = dcd.device_component_id INNER JOIN gongfu_device_part p ON dcd.model_part_id = p.id LEFT JOIN gongfu_device_part_language_data ld ON dcd.model_part_id = ld.source_id - WHERE p.enable=1 AND dc.`enable` = 1 AND dc.model_no=#{modelNo} AND ld.language_code=#{language} + WHERE p.enable=1 AND dc.`enable` = 1 AND dc.product_line=#{productLine} AND ld.language_code=#{language}