From f80b8f0d427bb25a750fdd4c57bcf3fdad7bd7fe Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 21 五月 2021 17:58:03 +0800
Subject: [PATCH] update springboot 升级 2.3.11 update mybatis-plus 升级 3.4.3 分页Plus对象适配更新
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
index 34b89b3..45addb3 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
@@ -1,14 +1,15 @@
package com.ruoyi.common.utils;
-import java.util.Collection;
-import java.util.List;
-
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.spring.SpringUtils;
+
+import java.util.Collection;
+import java.util.List;
/**
* 瀛楀吀宸ュ叿绫�
@@ -87,7 +88,7 @@
StringBuilder propertyString = new StringBuilder();
List<SysDictData> datas = getDictCache(dictType);
- if (StrUtil.containsAny(separator, dictValue) && Validator.isNotEmpty(datas))
+ if (StrUtil.containsAny(separator, dictValue) && CollUtil.isNotEmpty(datas))
{
for (SysDictData dict : datas)
{
@@ -127,7 +128,7 @@
StringBuilder propertyString = new StringBuilder();
List<SysDictData> datas = getDictCache(dictType);
- if (StrUtil.containsAny(separator, dictLabel) && Validator.isNotEmpty(datas))
+ if (StrUtil.containsAny(separator, dictLabel) && CollUtil.isNotEmpty(datas))
{
for (SysDictData dict : datas)
{
--
Gitblit v1.9.3