diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java index ca5ef2d..f1196b8 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java @@ -10,7 +10,7 @@ import java.util.Objects; * 语种表 */ @Data -public class VoiceLanguage implements Comparable { +public class VoiceLanguage { /** * 主键ID @@ -40,6 +40,10 @@ public class VoiceLanguage implements Comparable { * */ private String name; + /** + * + */ + private String Cname; /** * 图片 */ @@ -57,19 +61,4 @@ public class VoiceLanguage implements Comparable { */ private Integer isDel; - @Override - public int compareTo(Object obj) { - // 判断是否是学生类型 - if (obj instanceof VoiceLanguage) { - VoiceLanguage s = (VoiceLanguage) obj; - // 如果是学生类型,如果学号相等,则不加入Set - if (Objects.equals(s.getLanguage(), this.getLanguage()) && Objects.equals(s.getCountry(), this.getCountry())) { - return 0; - } else { - return 1; - } - } else { - return 0; - } - } } 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 0b436dd..8990593 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).orderByAsc(VoiceLanguage::getName).select(VoiceLanguage::getId, VoiceLanguage::getName, VoiceLanguage::getImg)); + List languages = voiceLanguageMapper.selectList(new LambdaQueryWrapper().eq(VoiceLanguage::getIsDel, 0).orderByAsc(VoiceLanguage::getName).select(VoiceLanguage::getId, VoiceLanguage::getName, VoiceLanguage::getImg, VoiceLanguage::getCname)); return CollectionUtils.isEmpty(languages) ? Lists.newArrayList() : languages; } }