|
@@ -218,19 +218,21 @@ public class BasicClazzServiceImpl extends ServiceImpl<BasicClazzMapper, BasicCl
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public String findClazzNamesByClazzIds(String clazzIds, String separator) {
|
|
public String findClazzNamesByClazzIds(String clazzIds, String separator) {
|
|
- String[] strArr;
|
|
|
|
- if (SystemConstant.strNotNull(separator)){
|
|
|
|
- strArr = clazzIds.split(separator);
|
|
|
|
- }else {
|
|
|
|
- strArr = clazzIds.split(",");
|
|
|
|
|
|
+ if (!SystemConstant.strNotNull(separator)) {
|
|
|
|
+ separator = ",";
|
|
}
|
|
}
|
|
|
|
+ String[] strArr;
|
|
|
|
+ strArr = clazzIds.split(separator);
|
|
Set<Long> clazzIdSet = Arrays.stream(strArr).map(SystemConstant::convertIdToLong).collect(Collectors.toSet());
|
|
Set<Long> clazzIdSet = Arrays.stream(strArr).map(SystemConstant::convertIdToLong).collect(Collectors.toSet());
|
|
List<String> clazzNameList = this.findClazzNamesByClazzIdSet(clazzIdSet);
|
|
List<String> clazzNameList = this.findClazzNamesByClazzIdSet(clazzIdSet);
|
|
- return String.join(separator,clazzNameList);
|
|
|
|
|
|
+ return String.join(separator, clazzNameList);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public String findClazzNamesByClazzIds(List<Long> clazzIdList, String separator) {
|
|
public String findClazzNamesByClazzIds(List<Long> clazzIdList, String separator) {
|
|
|
|
+ if (!SystemConstant.strNotNull(separator)) {
|
|
|
|
+ separator = ",";
|
|
|
|
+ }
|
|
Set<Long> clazzIdSet = new HashSet<>(clazzIdList);
|
|
Set<Long> clazzIdSet = new HashSet<>(clazzIdList);
|
|
List<String> clazzNameList = this.findClazzNamesByClazzIdSet(clazzIdSet);
|
|
List<String> clazzNameList = this.findClazzNamesByClazzIdSet(clazzIdSet);
|
|
return String.join(separator,clazzNameList);
|
|
return String.join(separator,clazzNameList);
|