ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 法规字典翻译

Browse Source
This commit is contained in:
liao
2023-09-18 15:17:38 +08:00
parent 207a605501
commit 850260cc3c
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+2 -10
View File
@@ -163,12 +163,11 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
if (!Objects.isNull(entryMap.getValue())) { if (!Objects.isNull(entryMap.getValue())) {
value = (String) entryMap.getValue(); value = (String) entryMap.getValue();
} }
resultMap.put(key, value);
// 如果value不为null和""，对返回结果做处理 // 如果value不为null和""，对返回结果做处理
if (StringUtils.isNotBlank(value)) { if (StringUtils.isNotBlank(value)) {
// 对返回的字段值做处理 // 对返回的字段值做处理
processResultFieldValue(key, value, fieldList, resultMap, dictItemList); processResultFieldValue(key, value, fieldList, resultMap, dictItemList);
} else {
resultMap.put(key, value);
} }
} }
return resultMap; return resultMap;
@@ -200,12 +199,11 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
if (!Objects.isNull(entryMap.getValue())) { if (!Objects.isNull(entryMap.getValue())) {
value = (String) entryMap.getValue(); value = (String) entryMap.getValue();
} }
resultMap.put(key, value);
// 如果value不为null和""，对返回结果做处理 // 如果value不为null和""，对返回结果做处理
if (StringUtils.isNotBlank(value)) { if (StringUtils.isNotBlank(value)) {
// 对返回的字段值做处理 // 对返回的字段值做处理
processResultFieldValue(key, value, fieldList, resultMap, dictItemList); processResultFieldValue(key, value, fieldList, resultMap, dictItemList);
} else {
resultMap.put(key, value);
} }
} }
resultMapList.add(resultMap); resultMapList.add(resultMap);
@@ -220,10 +218,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
**/ **/
private void processResultFieldValue(String key, String value, List<LawsTag> fieldList, private void processResultFieldValue(String key, String value, List<LawsTag> fieldList,
Map<String, Object> resultMap, List<SysDictItem> dictItemList) { Map<String, Object> resultMap, List<SysDictItem> dictItemList) {
if ("id".equals(key)) {
resultMap.put(key, value);
return;
}
for (LawsTag lawsTag : fieldList) { for (LawsTag lawsTag : fieldList) {
if (key.equals(lawsTag.getDbFieldName())) { if (key.equals(lawsTag.getDbFieldName())) {
List<String> valueList = Arrays.asList(value.split(",")); List<String> valueList = Arrays.asList(value.split(","));
@@ -260,8 +254,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
&& valueList.contains(dictItem.getItemValue())) && valueList.contains(dictItem.getItemValue()))
.map(SysDictItem::getItemText).collect(Collectors.toList()); .map(SysDictItem::getItemText).collect(Collectors.toList());
resultMap.put(key + FieldCommon._DICT_TEXT, StringUtils.join(nameList, ",")); resultMap.put(key + FieldCommon._DICT_TEXT, StringUtils.join(nameList, ","));
} else {
resultMap.put(key, value);
} }
} }
} }