Merge remote-tracking branch 'origin/thirdStage' into thirdApiStage

2024-01-22 09:54:53 +08:00
parent 4387eed5a2 25753634bd
commit 74fb0733db
82 changed files with 2197 additions and 904 deletions
@@ -33,6 +33,7 @@ import com.jero.modules.system.mapper.*;
 import com.jero.modules.system.service.*;
 import com.jero.modules.system.util.SecurityUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.sequence.KeepCommand;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jetbrains.annotations.NotNull;
@@ -1166,6 +1167,21 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 		return sysDictService.loadDict(dictCode, keyword, pageSize);
 	}

+	@Override
+	public String translateByDictMap(Map<String, String> dictMap, String keys) {
+		if (keys == null){
+			return null;
+		}
+		String[] keyList = keys.split(",");
+		List<String> resultList = new ArrayList<>();
+		for (String key : keyList) {
+			if (dictMap.containsKey(key)){
+				resultList.add(dictMap.get(key));
+			}
+		}
+		return String.join(",",resultList);
+	}
+
 	@Override
 	public Map<String, List<DictModel>> translateManyDict(String dictCodes, String keys) {
 		List<String> dictCodeList = Arrays.asList(dictCodes.split(","));