fix bug 41843 导入--导入的文件为空,页面显示“操作成功”

This commit is contained in:
lijiarao
2021-11-01 19:08:25 +08:00
parent 5a91835180
commit 863423679c
2 changed files with 10 additions and 2 deletions
@@ -15,6 +15,7 @@ import com.jero.common.util.ValidUtil;
import com.jero.modules.system.model.SysDepartExcel;
import com.jero.modules.system.util.FindsDepartsChildrenUtil;
import io.swagger.models.auth.In;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import com.jero.common.api.vo.Result;
@@ -403,14 +404,20 @@ public class SysDepartController {
params.setNeedSave(true);
//导入Excel格式校验,看匹配的字段文本概率
Boolean t = ExcelImportCheckUtil.check(file.getInputStream(), SysDepartExcel.class, params,1.0);
if (t == null){
return Result.error("文件导入失败: 导入数据为空");
}
if(!t){
return Result.error("表头有误!");
return Result.error("文件导入失败: 表头有误!");
}
try {
// orgCode编码长度
int codeLength = YouBianCodeUtil.zhanweiLength;
listSysDeparts = ExcelImportUtil.importExcel(file.getInputStream(), SysDepartExcel.class, params);
listSysDeparts = listSysDeparts.stream().filter(i -> !oConvertUtils.checkObjAllFieldsIsNull(i)).collect(Collectors.toList());
if (CollectionUtils.isEmpty(listSysDeparts)){
return Result.error("文件导入失败: 导入数据为空");
}
//按长度排序
Collections.sort(listSysDeparts, new Comparator<SysDepartExcel>() {
@Override