dev^2
itcast 1 year ago
parent 1140f1f7b5
commit a5b6b52d34
  1. 6
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java

@ -449,7 +449,7 @@ public class FieldxController extends JeecgController<Fieldx, IFieldxService> {
fieldx222.setTableId(excelInfo.getTableId()); fieldx222.setTableId(excelInfo.getTableId());
if (StringUtil.isBlank(excelInfo.getFieldName())) { if (StringUtil.isBlank(excelInfo.getFieldName())) {
message.put("isError", "true"); message.put("isError", "true");
message.put("status","序号为 + (r - 2) + 的”中文名称”不能为空"); message.put("status","序号为 "+ (r - 2) + "的”中文名称”不能为空");
message.put("closeable","true"); message.put("closeable","true");
webSocketUtils.sendMessage(loginUser.getId(), message); webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("序号为" + (r - 2) + "的中文名称不能为空"); return Result.error("序号为" + (r - 2) + "的中文名称不能为空");
@ -457,14 +457,14 @@ public class FieldxController extends JeecgController<Fieldx, IFieldxService> {
String fieldname= String.valueOf(fieldx222Service.query().eq("field_name",excelInfo.getFieldName()).one()); String fieldname= String.valueOf(fieldx222Service.query().eq("field_name",excelInfo.getFieldName()).one());
if(!StringUtil.isBlank(fieldname)){ if(!StringUtil.isBlank(fieldname)){
message.put("isError", "true"); message.put("isError", "true");
message.put("status","序号为 + (r - 2) + 的”中文名称”与表中数据已重复"); message.put("status","序号为 "+ (r - 2) + "的”中文名称”与表中数据已重复");
message.put("closeable","true"); message.put("closeable","true");
webSocketUtils.sendMessage(loginUser.getId(), message); webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("序号为" + (r - 2) + "的中文名称与表中数据已重复"); return Result.error("序号为" + (r - 2) + "的中文名称与表中数据已重复");
} }
if (StringUtil.isBlank(excelInfo.getFieldName())) { if (StringUtil.isBlank(excelInfo.getFieldName())) {
message.put("isError", "true"); message.put("isError", "true");
message.put("status","序号为 + (r - 2) + 的”中文名称”不能为空"); message.put("status","序号为 "+ (r - 2) +" 的”中文名称”不能为空");
message.put("closeable","true"); message.put("closeable","true");
webSocketUtils.sendMessage(loginUser.getId(), message); webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("序号为" + (r - 2) + "的中文名称不能为空"); return Result.error("序号为" + (r - 2) + "的中文名称不能为空");

Loading…
Cancel
Save