Procházet zdrojové kódy

导入excel整形值校验优化

RuoYi před 5 roky
rodič
revize
fec24d6785

+ 4 - 4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java

@@ -237,19 +237,19 @@ public class ExcelUtil<T>
237
                             val = Convert.toStr(val);
237
                             val = Convert.toStr(val);
238
                         }
238
                         }
239
                     }
239
                     }
240
-                    else if ((Integer.TYPE == fieldType) || (Integer.class == fieldType))
240
+                    else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))
241
                     {
241
                     {
242
                         val = Convert.toInt(val);
242
                         val = Convert.toInt(val);
243
                     }
243
                     }
244
-                    else if ((Long.TYPE == fieldType) || (Long.class == fieldType))
244
+                    else if (Long.TYPE == fieldType || Long.class == fieldType)
245
                     {
245
                     {
246
                         val = Convert.toLong(val);
246
                         val = Convert.toLong(val);
247
                     }
247
                     }
248
-                    else if ((Double.TYPE == fieldType) || (Double.class == fieldType))
248
+                    else if (Double.TYPE == fieldType || Double.class == fieldType)
249
                     {
249
                     {
250
                         val = Convert.toDouble(val);
250
                         val = Convert.toDouble(val);
251
                     }
251
                     }
252
-                    else if ((Float.TYPE == fieldType) || (Float.class == fieldType))
252
+                    else if (Float.TYPE == fieldType || Float.class == fieldType)
253
                     {
253
                     {
254
                         val = Convert.toFloat(val);
254
                         val = Convert.toFloat(val);
255
                     }
255
                     }