Commit 497f98ba902b6d694ff1d3908d2aa7a1639265ed

Authored by RuoYi
1 parent a948affb

导入excel整形值校验优化

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
... ... @@ -243,19 +243,19 @@ public class ExcelUtil<T>
243 243 val = Convert.toStr(val);
244 244 }
245 245 }
246   - else if ((Integer.TYPE == fieldType) || (Integer.class == fieldType))
  246 + else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))
247 247 {
248 248 val = Convert.toInt(val);
249 249 }
250   - else if ((Long.TYPE == fieldType) || (Long.class == fieldType))
  250 + else if (Long.TYPE == fieldType || Long.class == fieldType)
251 251 {
252 252 val = Convert.toLong(val);
253 253 }
254   - else if ((Double.TYPE == fieldType) || (Double.class == fieldType))
  254 + else if (Double.TYPE == fieldType || Double.class == fieldType)
255 255 {
256 256 val = Convert.toDouble(val);
257 257 }
258   - else if ((Float.TYPE == fieldType) || (Float.class == fieldType))
  258 + else if (Float.TYPE == fieldType || Float.class == fieldType)
259 259 {
260 260 val = Convert.toFloat(val);
261 261 }
... ...