diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/excelGroupValidation/ExcelUtil.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/excelGroupValidation/ExcelUtil.java
index 9d6dd7d5..cc709abb 100644
--- a/admin-core/src/main/java/com/ibeetl/admin/core/util/excelGroupValidation/ExcelUtil.java
+++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/excelGroupValidation/ExcelUtil.java
@@ -169,7 +169,7 @@ public class ExcelUtil {
createCell(sheet, size, columnIndex, nameString);
if (CollectionUtils.isNotEmpty(data)) {
for (Object val : data) {
- createCell(sheet, size, ++columnIndex, String.valueOf(val));
+ createCell(sheet, size, ++columnIndex, replaceNameName(String.valueOf(val)));
}
}
}
@@ -181,7 +181,7 @@ public class ExcelUtil {
*/
public static String replaceNameName(String nameName) {
// 首字母必须是中文，支持有限的符号
- return ReUtil.replaceAll(nameName, "[^\\u4e00-\\u9fa5_0-9a-zA-Z]", "");
+ return "_" + ReUtil.replaceAll(nameName, "[^\\u4e00-\\u9fa5_0-9a-zA-Z]", "");
}
private static String getCellColumnFlag(int num) {
diff --git a/admin-core/src/main/resources/static/plugins/layui/layui.js b/admin-core/src/main/resources/static/plugins/layui/layui.js
index 7cfa493a..d78769d9 100644
--- a/admin-core/src/main/resources/static/plugins/layui/layui.js
+++ b/admin-core/src/main/resources/static/plugins/layui/layui.js
@@ -5312,8 +5312,10 @@ layui.define("layer", function (e) {
success: function (t) {
i++, d(e, t), u()
},
- error: function () {
- n++, a.msg("请求上传接口出现异常"), m(e), u()
+ error: function (e) {
+ // n++, a.msg("请求上传接口出现异常"), m(e), u()
+ // TODO 这里修改了layui的源码，该文件不能被替换
+ n++, a.msg((e.responseJSON && e.responseJSON.msg && e.responseJSON.code != 200) ? e.responseJSON.msg : "请求上传接口出现异常"), m(e), u()
}
};
"function" == typeof l.progress && (c.xhr = function () {
diff --git a/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java b/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java
index 23b537fd..4c306319 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java
@@ -321,24 +321,37 @@ public class SchoolClassController extends BaseController {
// 判断错误的结果集
Assert.isTrue(CollectionUtil.isEmpty(listener.getFailMessage()), JSONUtil.toJsonStr(listener.getFailMessage()));
// 类型转换
- List<SchoolClass> classList = listener.getData().stream()
+ List<SchoolClass> list = listener.getData().stream()
// .map(item -> SchoolClassBatchImportDTO.pojo(item, (e) -> e))
.map(SchoolClassBatchImportDTO::pojo)
.collect(Collectors.toList());
// 设置机构ID
- setObjectOrgId(classList, (e) -> {
- UniversitiesColleges universitiesColleges = new UniversitiesColleges();
- universitiesColleges.setUniversitiesCollegesId(e.getUniversitiesCollegesId());
- UniversitiesColleges uc = universitiesCollegesDao.templateOne(universitiesColleges);
- if (uc != null) {
- return uc.getOrgId();
+ setObjectOrgId(list, (e) -> {
+ UniversitiesColleges params = new UniversitiesColleges();
+ params.setUniversitiesCollegesId(e.getUniversitiesCollegesId());
+ UniversitiesColleges sc = universitiesCollegesDao.templateOne(params);
+ if (sc != null) {
+ if (coreUser.isAdmin()) {
+ return sc.getOrgId();
+ }
+ // 告知前端，异常信息
+ if (!coreUser.getOrgId().equals(sc.getOrgId())) {
+ listener.putFailMessage(StrUtil.format("异常的院校ID：{}，无权限上传到其他学校", e.getUniversitiesCollegesId()));
+ }
+ if (sc.getUniversitiesCollegesStatus() != 1) {
+ listener.putFailMessage(StrUtil.format("异常的院校ID：{}，该院校已删除状态", e.getUniversitiesCollegesId()));
+ }
+ return sc.getOrgId();
+ }
+ else {
+ listener.putFailMessage(StrUtil.format("异常的院校ID：{}，未查询到院校信息，请联系管理员", e.getUniversitiesCollegesId()));
}
return null;
}, true);
try {
- schoolClassService.validateClassSnListIsExistsThrow(classList, classList.get(0).getOrgId().toString());
+ schoolClassService.validateClassSnListIsExistsThrow(list, list.get(0).getOrgId().toString());
}
catch (IllegalArgumentException e) {
listener.putFailMessage(e.getMessage());
@@ -349,7 +362,7 @@ public class SchoolClassController extends BaseController {
Assert.isTrue(CollectionUtil.isEmpty(listener.getFailMessage()), JSONUtil.toJsonStr(listener.getFailMessage()));
}
- schoolClassService.insertBatch(classList);
+ schoolClassService.insertBatch(list);
}
catch (IllegalArgumentException exception) {
return JsonResult.failMessage(exception.getMessage()).setCode(DIY_ERROR.getCode());
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java
index 3acb5b28..12e5f75c 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java
@@ -1539,8 +1539,6 @@ public class TeacherController extends BaseController {
/**
* 功能描述: <br>
- * 〈导入批量模板数据〉
- * 批量导入题目 excel版本，只支持单选多选，对错吧
* @param file
* @return {@link JsonResult}
* @Author: 87966
@@ -1568,11 +1566,23 @@ public class TeacherController extends BaseController {
setObjectOrgId(list, (e) -> {
UniversitiesColleges params = new UniversitiesColleges();
params.setUniversitiesCollegesId(e.getUniversitiesCollegesId());
- params.setUniversitiesCollegesStatus(1);
UniversitiesColleges sc = universitiesCollegesDao.templateOne(params);
if (sc != null) {
+ if (coreUser.isAdmin()) {
+ return sc.getOrgId();
+ }
+ // 告知前端，异常信息
+ if (!coreUser.getOrgId().equals(sc.getOrgId())) {
+ listener.putFailMessage(StrUtil.format("异常的院校ID：{}，无权限上传到其他学校", e.getUniversitiesCollegesId()));
+ }
+ if (sc.getUniversitiesCollegesStatus() != 1) {
+ listener.putFailMessage(StrUtil.format("异常的院校ID：{}，该院校已删除状态", e.getUniversitiesCollegesId()));
+ }
return sc.getOrgId();
}
+ else {
+ listener.putFailMessage(StrUtil.format("异常的院校ID：{}，未查询到院校信息，请联系管理员", e.getUniversitiesCollegesId()));
+ }
return null;
}, true);