lbqms.git - Gitblit

			@@ -15,7 +15,8 @@
			import com.ruoyi.common.exception.ServiceException;
			import com.ruoyi.common.utils.StreamUtils;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.common.utils.cache.CacheUtils;
			import com.ruoyi.common.utils.redis.CacheUtils;
			import com.ruoyi.common.utils.spring.SpringUtils;
			import com.ruoyi.system.mapper.SysDictDataMapper;
			import com.ruoyi.system.mapper.SysDictTypeMapper;
			import com.ruoyi.system.service.ISysDictTypeService;
			@@ -112,6 +113,7 @@
			* @param dictType 字典类型
			* @return 字典类型
			*/
			@Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType")
			@Override
			public SysDictType selectDictTypeByType(String dictType) {
			return baseMapper.selectById(new LambdaQueryWrapper<SysDictType>().eq(SysDictType::getDictType, dictType));
			@@ -232,7 +234,7 @@
			@Override
			public String getDictLabel(String dictType, String dictValue, String separator) {
			StringBuilder propertyString = new StringBuilder();
			List<SysDictData> datas = selectDictDataByType(dictType);
			List<SysDictData> datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);

			if (StringUtils.containsAny(dictValue, separator) && CollUtil.isNotEmpty(datas)) {
			for (SysDictData dict : datas) {
			@@ -264,7 +266,7 @@
			@Override
			public String getDictValue(String dictType, String dictLabel, String separator) {
			StringBuilder propertyString = new StringBuilder();
			List<SysDictData> datas = selectDictDataByType(dictType);
			List<SysDictData> datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);

			if (StringUtils.containsAny(dictLabel, separator) && CollUtil.isNotEmpty(datas)) {
			for (SysDictData dict : datas) {