|
@@ -136,13 +136,10 @@ public class StudentImportAnalysis extends DataAnalysis<StudentImportAnalysis> {
|
|
|
if (StringUtils.isEmpty(item.getSubjectName())) {
|
|
|
ret.append("声部不能为空;");
|
|
|
}else {
|
|
|
- String[] split = item.getSubjectName().replaceAll(" ", "").replaceAll(",", ",").split(",");
|
|
|
- for (String s : split) {
|
|
|
- if (!subjectMap.containsKey(s)) {
|
|
|
- ret.append("声部无效:").append(s);
|
|
|
- }
|
|
|
- item.setSubjectId(subjectMap.get(s));
|
|
|
+ if (!subjectMap.containsKey(item.getSubjectName())) {
|
|
|
+ ret.append("声部无效:").append(item.getSubjectName());
|
|
|
}
|
|
|
+ item.setSubjectId(subjectMap.get(item.getSubjectName()));
|
|
|
}
|
|
|
if (StringUtils.isEmpty(item.getTenantName())) {
|
|
|
ret.append("机构名称不能为空;");
|