|
@@ -461,11 +461,9 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
|
|
|
continue;
|
|
|
}
|
|
|
if (columnValue.equals("calenderId")) {
|
|
|
- if (StringUtils.isEmpty(row.get(s).toString())) {
|
|
|
- sb.append("第" + rowNum).append("行数据导入失败:学校缴费项id不可为空;");
|
|
|
- continue valueIsNull;
|
|
|
- } else if (!schoolCalender.containsKey(row.get(s).toString())) {
|
|
|
+ if (StringUtils.isNotBlank(row.get(s).toString()) && !schoolCalender.containsKey(row.get(s).toString())) {
|
|
|
sb.append("第" + rowNum).append("行数据导入失败:学校缴费项id不存在;");
|
|
|
+ continue valueIsNull;
|
|
|
} else {
|
|
|
objectMap.put("calenderId", row.get(s));
|
|
|
}
|