From a59e33b38560655b279cebfe85e3b62a6b8b0514 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期一, 20 十一月 2023 09:05:27 +0800
Subject: [PATCH] 编号
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/utils/GetShowDictList.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/utils/GetShowDictList.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/utils/GetShowDictList.java
index 8cc92e9..5f6a01e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/utils/GetShowDictList.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/utils/GetShowDictList.java
@@ -17,22 +17,25 @@
@Autowired
private SysDictTypeService sysDictTypeService;
- public String getShowDictList(String values, String DictTYpe, Boolean enter) {
- List<DictDto> userDicts = sysDictTypeService.getUserDicts();
- DictDto testType1Dict = userDicts.stream()
- .filter(c -> c.getDictType().equals(DictTYpe))
- .collect(Collectors.toList()).get(0);
- values = "," + values + ",";
+ public String getShowDictList(Object paramValues, String DictTYpe, Boolean enter) {
String result = "";
- int i = 0;
- for (DictItemDto dictItemDto : ((DictLeafDto) testType1Dict).getDataList()) {
- String value = dictItemDto.getDictValue();
- String desc = (values.contains("," + value + ",") ? "鈽�" : "鈻�") + dictItemDto.getDictLabel();
- i++;
- if (enter && i < ((DictLeafDto) testType1Dict).getDataList().size()) {
- desc = desc + "\r\n";
+ if (paramValues != null) {
+ List<DictDto> userDicts = sysDictTypeService.getUserDicts();
+ DictDto testType1Dict = userDicts.stream()
+ .filter(c -> c.getDictType().equals(DictTYpe))
+ .collect(Collectors.toList()).get(0);
+
+ String values = "," + paramValues.toString() + ",";
+ int i = 0;
+ for (DictItemDto dictItemDto : ((DictLeafDto) testType1Dict).getDataList()) {
+ String value = dictItemDto.getDictValue();
+ String desc = (values.contains("," + value + ",") ? "鈽�" : "鈻�") + dictItemDto.getDictLabel();
+ i++;
+ if (enter && i < ((DictLeafDto) testType1Dict).getDataList().size()) {
+ desc = desc + "\r\n";
+ }
+ result = result + desc;
}
- result = result + desc;
}
return result;
}
--
Gitblit v1.9.1