消息发送完成

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java

@@ -102,4 +102,13 @@ public interface ISysDictTypeService extends IServicePlus<SysDictType> {
      * @return 结果
      */
     public String checkDictTypeUnique(SysDictType dictType);
+
+
+	/**
+	 * 根据字典类型+字典数据 = 指定字典
+	 *
+	 * @param dictType 字典类型
+	 * @return 字典数据集合信息
+	 */
+	public SysDictData selectDictDataByTypeAndData(String dictType,String dictData);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java

@@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -235,4 +236,25 @@ public class SysDictTypeServiceImpl extends ServicePlusImpl<SysDictTypeMapper, S
 		}
 		return UserConstants.UNIQUE;
 	}
+
+	@Override
+	public SysDictData selectDictDataByTypeAndData(String dictType, String dictData) {
+		List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
+		if (CollUtil.isNotEmpty(dictDatas)) {
+			for (SysDictData data : dictDatas) {
+				if (data.getDictValue().equals(dictData)){
+					return data;
+				}
+			}
+		}
+		dictDatas = dictDataMapper.selectDictDataByType(dictType);
+		if (CollUtil.isNotEmpty(dictDatas)) {
+			for (SysDictData data : dictDatas) {
+				if (data.getDictValue().equals(dictData)){
+					return data;
+				}
+			}
+		}
+		return null;
+	}
 }