From 3d0f0c9aae07ea5f78bf1b232663c69d6d3fd80b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A8=8B=E5=AD=90?= <395030787@qq.com>
Date: Mon, 3 Mar 2025 07:58:31 +0000
Subject: [PATCH] =?UTF-8?q?update=20ruoyi-common/src/main/java/com/ruoyi/c?=
 =?UTF-8?q?ommon/utils/poi/ExcelUtil.java.=20=E8=A7=A3=E5=86=B3Boolean?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=B1=9E=E6=80=A7=E5=9C=A8=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E6=95=B0=E6=8D=AE=E5=90=8E,=20?=
 =?UTF-8?q?=E4=BC=9A=E5=85=88=E8=A2=AB=E6=AD=A4=20val=20=3D=20Convert.toBo?=
 =?UTF-8?q?ol(val,=20false)=20=E8=A7=A3=E6=9E=90=E4=B8=BA=20Boolean=20?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B,=20=E4=B9=8B=E5=90=8E=20val=20=3D=20reverseB?=
 =?UTF-8?q?yExp(Convert.toStr(val),=20attr.readConverterExp(),=20attr.sepa?=
 =?UTF-8?q?rator())=20=E6=AD=A4=E6=96=B9=E6=B3=95=E5=9C=A8=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E5=8F=8D=E5=90=91=E8=A7=A3=E6=9E=90=E5=80=BC=E6=97=B6?=
 =?UTF-8?q?,=20=E6=97=A0=E6=B3=95=E5=8C=B9=E9=85=8D=E5=88=B0=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=B8=BA"",=20=E5=AF=BC=E8=87=B4=20Boolean=20?=
 =?UTF-8?q?=E5=80=BC=E4=B8=A2=E5=A4=B1.=20=E5=A6=82:=20=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=20@Excel(name=20=3D=20"=E6=98=AF=E5=90=A6=E6=89=93=E5=BC=80",?=
 =?UTF-8?q?=20readConverterExp=20=3D=20"true=3Dyes,false=3Dno")=20=20priva?=
 =?UTF-8?q?te=20Boolean=20isOpen;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

首先会执行  val = Convert.toBool(val, false); 此方法返回 Boolean 类型.
public static Boolean toBool(Object value, Boolean defaultValue)
    {
        if (value == null)
        {
            return defaultValue;
        }
        if (value instanceof Boolean)
        {
            return (Boolean) value;
        }
        String valueStr = toStr(value, null);
        if (StringUtils.isEmpty(valueStr))
        {
            return defaultValue;
        }
        valueStr = valueStr.trim().toLowerCase();
        switch (valueStr)
        {
            case "true":
            case "是":
            case "yes":
            case "ok":
            case "1":
                return true;
            case "否":
            case "false":
            case "no":
            case "0":
                return false;
            default:
                return defaultValue;
        }
    }

Signed-off-by: 程子 <395030787@qq.com>
---
 .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 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 9191c7a128..df2ee33380 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
@@ -1332,7 +1332,7 @@ public class ExcelUtil<T>
             {
                 for (String value : propertyValue.split(separator))
                 {
-                    if (itemArray[1].equals(value))
+                    if (itemArray[1].equals(value) || itemArray[0].equals(value))
                     {
                         propertyString.append(itemArray[0] + separator);
                         break;
@@ -1341,7 +1341,7 @@ public class ExcelUtil<T>
             }
             else
             {
-                if (itemArray[1].equals(propertyValue))
+                if (itemArray[1].equals(propertyValue) || itemArray[0].equals(propertyValue))
                 {
                     return itemArray[0];
                 }
-- 
Gitee