updates
This commit is contained in:
parent
2a9d09ae36
commit
c02f75057e
|
|
@ -318,10 +318,6 @@ public class YxSchoolMajorController extends JeecgController<YxSchoolMajor, IYxS
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (index==54) {
|
|
||||||
System.out.println("111");
|
|
||||||
}
|
|
||||||
|
|
||||||
majorType = item.getMajorType();
|
majorType = item.getMajorType();
|
||||||
mainSubjects = item.getMainSubjects();
|
mainSubjects = item.getMainSubjects();
|
||||||
majorTypeChild = item.getMajorTypeChild();
|
majorTypeChild = item.getMajorTypeChild();
|
||||||
|
|
@ -433,7 +429,7 @@ public class YxSchoolMajorController extends JeecgController<YxSchoolMajor, IYxS
|
||||||
if (org.apache.commons.lang.StringUtils.isBlank(item.getSchoolCode()) && org.apache.commons.lang.StringUtils.isBlank(item.getMajorName())) {
|
if (org.apache.commons.lang.StringUtils.isBlank(item.getSchoolCode()) && org.apache.commons.lang.StringUtils.isBlank(item.getMajorName())) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
AssertUtils.isTrue(schoolCodeList.contains(item.getSchoolCode()),String.format("行[%s],学校代码-[%s]-系统不存在", index,item.getSchoolCode()));
|
// AssertUtils.isTrue(schoolCodeList.contains(item.getSchoolCode()),String.format("行[%s],学校代码-[%s]-系统不存在", index,item.getSchoolCode()));
|
||||||
key = item.getSchoolCode()+a+item.getBatch()+a+item.getMajorName()+a+item.getCategory();
|
key = item.getSchoolCode()+a+item.getBatch()+a+item.getMajorName()+a+item.getCategory();
|
||||||
|
|
||||||
yxSchoolMajor = schoolMajorMap.get(key);
|
yxSchoolMajor = schoolMajorMap.get(key);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue