From c9e6b686d1a219f309b8a8a2c483744cbb2f3dff Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 16 Aug 2024 22:21:37 +0800
Subject: [PATCH] =?UTF-8?q?fix(88791):=20=E6=A0=87=E5=87=86=E6=8B=86?=
 =?UTF-8?q?=E5=88=86--=E7=BC=96=E8=BE=91--=E5=AF=BC=E5=87=BA--=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9C=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/FileSplitItemsEOServiceImpl.java     | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index f2dca122..f81547f7 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -3915,6 +3915,11 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 .filter(e -> FieldTypeEnum.PERSON.getValue().equals(e.getFieldShowType()))
                 .collect(Collectors.toList());
         List<String> fieldPersonList = onlCgformFieldPersonList.stream().map(LawsTag::getDbFieldName).collect(Collectors.toList());
+        // 部门选择
+        List<LawsTag> onlCgformFieldDepartList = fieldList.stream()
+                .filter(e -> FieldTypeEnum.GROUP_MANY.getValue().equals(e.getFieldShowType()))
+                .collect(Collectors.toList());
+        List<String> fieldDepartList = onlCgformFieldDepartList.stream().map(LawsTag::getDbFieldName).collect(Collectors.toList());
         // 标准选择
         List<LawsTag> onlCgformFieldStanList = fieldList.stream()
                 .filter(e -> FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType()))
@@ -3950,7 +3955,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                         .filter(e -> entry.getKey().equals(e.getDbFieldName()) && !FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType()))
                         .collect(Collectors.toList());
                 // 特殊翻译
-                if (entry.getKey().equals("applicable_components")){
+                if (entry.getKey().equals("part_name")){
                     String applicableComponents = (String) entry.getValue();
                     List<PartName> partNames = IPartNameService.queryEcho(applicableComponents);
                     entry.setValue(partNames.stream().map(PartName::getName).collect(Collectors.joining(",")));
@@ -3985,6 +3990,18 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                         entry.setValue(value);
                     }
                 }
+                // 部门选择
+                if(fieldDepartList.contains(entry.getKey()) && StringUtils.isNotBlank((String)entry.getValue())) {
+                    List<SysDepart> sysDepartList = sysDepartService.listByIds(Arrays.asList(entry.getValue().toString().split(",")));
+                    if(CollectionUtil.isNotEmpty(sysDepartList)){
+                        StringBuilder stringBuilder = new StringBuilder();
+                        for(SysDepart sysDepart : sysDepartList){
+                            stringBuilder.append(sysDepart.getDepartName()).append(",");
+                        }
+                        String value = stringBuilder.substring(0, stringBuilder.lastIndexOf(","));
+                        entry.setValue(value);
+                    }
+                }
             }
         }
         return itemsDataForExport;