|
|
@@ -147,7 +147,7 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
|
|
|
try {
|
|
|
this.save(cur);
|
|
|
} catch (DuplicateKeyException e) {
|
|
|
- failRecords.add(newError(i + 1, "科目已存在"));
|
|
|
+// failRecords.add(newError(i + 1, "科目已存在"));
|
|
|
} catch (Exception e) {
|
|
|
failRecords.add(newError(i + 1, "系统异常"));
|
|
|
log.error("科目导入系统异常", e);
|
|
|
@@ -170,6 +170,7 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
|
|
|
private String trimAndNullIfBlank(String s) {
|
|
|
if (StringUtils.isBlank(s)) {
|
