rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/gongfu-20260126' into develop

This commit is contained in:
曹鹏飞 2026-01-27 16:06:22 +08:00
parent b48c639f27 8d215772fe
commit 32ee948087
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceMapper.java
View File

@ -47,5 +47,5 @@ public interface DeviceMapper extends BaseMapper<Device> {
List<DeviceAgentVO> getAgents();
List<ComponentInfo> getComponents1(String modelNo, String language);
List<ComponentInfo> getComponents1(String productLine, String language);
}

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceServiceImpl.java
View File

@ -39,7 +39,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> 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());

2
nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml
View File

@ -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}
</select>
</mapper>