From fb19dd3e4e7e99f3c11d91a35b5eccfb64bd4dc0 Mon Sep 17 00:00:00 2001
From: yongdaidai <7805924+yongdaidai@user.noreply.gitee.com>
Date: 星期五, 31 七月 2020 14:59:23 +0800
Subject: [PATCH] update ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml. 解决如果导入多个同名部门dept_name,parent_id相同,但是删除状态(del_flag)不同,导致查询结果为多条,mybatis不能映射为一条数据的问题.
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 51dbcd7..494fb4b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -17,7 +17,6 @@
import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
-
import org.apache.poi.hssf.usermodel.HSSFDateUtil;
import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.usermodel.Cell;
@@ -41,7 +40,6 @@
import org.apache.poi.xssf.usermodel.XSSFDataValidation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.annotation.Excel.Type;
@@ -201,8 +199,9 @@
// 设置类的私有字段属性可访问.
field.setAccessible(true);
Integer column = cellMap.get(attr.name());
- if(column !=null ) { // 字段在excel 中没有，那么就不需要设置值
- fieldsMap.put(column, field);
+ if (column != null)
+ {
+ fieldsMap.put(column, field);
}
}
}
@@ -695,7 +694,7 @@
}
return StringUtils.stripEnd(propertyString.toString(), separator);
}
-
+
/**
* 解析字典值
*
@@ -897,15 +896,7 @@
}
else
{
- /* if ((Double) val % 1 > 0)
- {
- val = new DecimalFormat("0.00").format(val);
- }
- else
- {
- val = new DecimalFormat("0").format(val);
- }*/
- val = new BigDecimal(val.toString()); // 导入的数据保证原汁原味，不做处理
+ val = new BigDecimal(val.toString()); // 浮点格式处理
}
}
else if (cell.getCellTypeEnum() == CellType.STRING)
--
Gitblit v1.9.2