From 62464cfe451884642c385f250be5e98d7c541dd6 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 22 三月 2021 13:31:43 +0800
Subject: [PATCH] fix Collection 验证失效问题
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 3 ++-
ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java | 11 ++++++-----
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java | 5 +++--
3 files changed, 11 insertions(+), 8 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)
{
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
index 1e75832..76174f7 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.generator.service;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
@@ -305,7 +306,7 @@
});
List<GenTableColumn> delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList());
- if (Validator.isNotEmpty(delColumns))
+ if (CollUtil.isNotEmpty(delColumns))
{
genTableColumnMapper.deleteGenTableColumns(delColumns);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
index 2c9f655..32f3946 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.service.impl;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Validator;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysDictData;
@@ -77,12 +78,12 @@
public List<SysDictData> selectDictDataByType(String dictType)
{
List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
- if (Validator.isNotEmpty(dictDatas))
+ if (CollUtil.isNotEmpty(dictDatas))
{
return dictDatas;
}
dictDatas = dictDataMapper.selectDictDataByType(dictType);
- if (Validator.isNotEmpty(dictDatas))
+ if (CollUtil.isNotEmpty(dictDatas))
{
DictUtils.setDictCache(dictType, dictDatas);
return dictDatas;
--
Gitblit v1.9.3