From 9d30a4652c543bc43f43d958beff6bbd4537d373 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 28 Nov 2020 11:51:41 +0800
Subject: [PATCH] =?UTF-8?q?Excel=E6=94=AF=E6=8C=81=E5=AF=BC=E5=85=A5Boolea?=
 =?UTF-8?q?n=E5=9E=8B=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/common/utils/poi/ExcelUtil.java    | 7 ++++---
 .../java/com/ruoyi/common/utils/reflect/ReflectUtils.java  | 6 ++++--
 2 files changed, 8 insertions(+), 5 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 95dc43f2..b3e8c5a9 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
@@ -279,6 +279,10 @@ public class ExcelUtil<T>
                             val = DateUtil.getJavaDate((Double) val);
                         }
                     }
+                    else if (Boolean.TYPE == fieldType || Boolean.class == fieldType)
+                    {
+                        val = Convert.toBool(val, false);
+                    }
                     if (StringUtils.isNotNull(fieldType))
                     {
                         Excel attr = field.getAnnotation(Excel.class);
@@ -295,9 +299,6 @@ public class ExcelUtil<T>
                         {
                             val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator());
                         }
-                        if (fieldType == boolean.class && (val == null||"".equals(val))) {
-                            val = false;
-                        }
                         ReflectUtils.invokeSetter(entity, propertyName, val);
                     }
                 }
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
index 6467927c..4d47e1ad 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
@@ -204,8 +204,10 @@ public class ReflectUtils
                             args[i] = DateUtil.getJavaDate((Double) args[i]);
                         }
                     }
-                     else if (cs[i] == boolean.class|| cs[i] == Boolean.class) {
-                        args[i] = Convert.toBool(args[i]);}
+                    else if (cs[i] == boolean.class|| cs[i] == Boolean.class)
+                    {
+                        args[i] = Convert.toBool(args[i]);
+                    }
                 }
             }
             return (E) method.invoke(obj, args);