From e6ea3ab5de3113a1952a836919c50f4becf706ce Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Thu, 1 Jun 2023 16:51:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=AD=E8=A8=80=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java | 2 +- .../com/iformall/service/sm/impl/VoiceLanguageServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java index eba303e..26d4259 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java @@ -20,7 +20,7 @@ public class VoiceInfoServiceImpl implements VoiceInfoService { @Override public List chooseType(Long id) { - List voiceInfos = voiceMapper.selectList(new LambdaQueryWrapper().eq(VoiceInfo::getLanguageId, id).select(VoiceInfo::getId, VoiceInfo::getDisplayName, VoiceInfo::getStyleList)); + List voiceInfos = voiceMapper.selectList(new LambdaQueryWrapper().eq(VoiceInfo::getLanguageId, id).orderByAsc(VoiceInfo::getDisplayName).select(VoiceInfo::getId, VoiceInfo::getDisplayName, VoiceInfo::getStyleList)); voiceInfos.forEach(x -> { if (StringUtils.isNotEmpty(x.getStyleList())) { List strings = JSON.parseArray(x.getStyleList(), String.class); diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceLanguageServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceLanguageServiceImpl.java index 9d618db..3d8cb9e 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceLanguageServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceLanguageServiceImpl.java @@ -20,7 +20,7 @@ public class VoiceLanguageServiceImpl implements VoiceLanguageService { @Override public List voiceTotal() { - List languages = voiceLanguageMapper.selectList(new LambdaQueryWrapper().eq(VoiceLanguage::getIsDel, 0).select(VoiceLanguage::getId, VoiceLanguage::getName)); + List languages = voiceLanguageMapper.selectList(new LambdaQueryWrapper().eq(VoiceLanguage::getIsDel, 0).orderByAsc(VoiceLanguage::getCountry).select(VoiceLanguage::getId, VoiceLanguage::getName, VoiceLanguage::getImg)); return CollectionUtils.isEmpty(languages) ? Lists.newArrayList() : languages; } } From 1ee00d1d63833e6ffd9ea8d1d5c43118e0d77ce4 Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Thu, 1 Jun 2023 16:53:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=AD=E8=A8=80=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/sm/impl/VoiceInfoServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java index 26d4259..726873e 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.sm.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.google.common.collect.Lists; import com.iformall.domain.po.sm.VoiceInfo; import com.iformall.mapper.VoiceMapper; import com.iformall.service.sm.VoiceInfoService; @@ -25,6 +26,8 @@ public class VoiceInfoServiceImpl implements VoiceInfoService { if (StringUtils.isNotEmpty(x.getStyleList())) { List strings = JSON.parseArray(x.getStyleList(), String.class); x.setStyle(strings); + } else { + x.setStyle(Lists.newArrayList()); } }); return voiceInfos;