From d6e4a1f930946ecaecaec3a3daa9d07dd370e9b1 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期五, 17 十一月 2023 11:40:08 +0800
Subject: [PATCH] 编号

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/utils/GetShowDictList.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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 1822cd3..8cc92e9 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
@@ -15,18 +15,23 @@
 @Service
 public class GetShowDictList {
     @Autowired
-    private  SysDictTypeService sysDictTypeService;
+    private SysDictTypeService sysDictTypeService;
 
-    public  String getShowDictList(String values, String DictTYpe) {
+    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 + ",";
         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";
+            }
             result = result + desc;
         }
         return result;

--
Gitblit v1.9.1