From 9d392430a2d147fe6e80a74f07129a7f25dee9cb Mon Sep 17 00:00:00 2001 From: Parker Date: Sat, 19 Dec 2020 18:43:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E6=88=B7ID=E4=B8=BA=E7=A9=BA=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E4=B8=B2=20=E5=A1=AB=E5=85=85=E5=A4=B1=E6=95=88BUG?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opsli/core/conf/mybatis/AutoFillInterceptor.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/conf/mybatis/AutoFillInterceptor.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/conf/mybatis/AutoFillInterceptor.java index 298d87b3..2b3778d0 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/conf/mybatis/AutoFillInterceptor.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/conf/mybatis/AutoFillInterceptor.java @@ -16,6 +16,7 @@ package org.opsli.core.conf.mybatis; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ReflectUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -143,16 +144,9 @@ public class AutoFillInterceptor implements Interceptor { case MyBatisConstants.FIELD_TENANT: // 如果租户ID 为空则进行默认赋值 Object tenantValue = ReflectUtil.getFieldValue(arg, f.getName()); - if(tenantValue == null){ + String tenantValueStr = Convert.toStr(tenantValue); + if(StringUtils.isBlank(tenantValueStr)){ setProperty(arg, MyBatisConstants.FIELD_TENANT, UserUtil.getTenantId()); - }else{ - // 如果 tenantId 为空字符串 自动转换为 null - if(tenantValue instanceof String){ - String tmp = String.valueOf(tenantValue); - if(StringUtils.isBlank(tmp)){ - setProperty(arg, MyBatisConstants.FIELD_TENANT, null); - } - } } break; default: