lbqms.git - Gitblit

			@@ -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)
			{

			@@ -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);
			}

			@@ -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;

	ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史