From 98fc9bbb5656a8107080c1b345df55cb820f8137 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 17 Mar 2022 19:59:40 +0800
Subject: [PATCH] feat: There is no way the,

---
 .../impl/SarLawsStandInfoServiceImpl.java     | 33 +++++++++++++++----
 .../service/impl/TsResourceServiceImpl.java   |  2 +-
 .../adc/da/utils/util/InitStandAttrUtil.java  |  3 +-
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java
index f55e2cb4..be058360 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java
@@ -254,7 +254,8 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
         row.setCollectId(collectId);
         // 查询属性表数据
         if (StringUtils.isNotBlank(fieldInfo)) {
-            Map<String, Object> getAttrMap = sarLawsAttrInfoDao.selectLawsFieldAndData(fieldInfo,row.getId());
+            Map<String, Object> getAttrMap = new TreeMap<>();
+            getAttrMap = sarLawsAttrInfoDao.selectLawsFieldAndData(fieldInfo,row.getId());
             if (InitStandAttrUtil.clobFieldListLaws != null && !InitStandAttrUtil.clobFieldListLaws.isEmpty()) {
                 // 遍历修改所有clob类型的值
                 for (String clobField : InitStandAttrUtil.clobFieldListLaws) {
@@ -285,16 +286,36 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
                             value = sysInfoEOService.getRoleNamesByIds(value);
                             newMap.put(name + "Name",value);
                         }
+                    }else if (entry.getValue() != null && InitStandAttrUtil.fileFieldListLaws != null && !InitStandAttrUtil.fileFieldListLaws.isEmpty() && InitStandAttrUtil.fileFieldListLaws.contains(entry.getKey())) {
+                        String value = entry.getValue().toString();
+                        if (StringUtils.isNotBlank(value)) {
+                            List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
+                            if(!fileObj.isEmpty()){
+                                String oldFileName = fileObj.stream().map(AttFileEO::getOldFileName).collect(Collectors.joining(","));
+                                newMap.put(name + "Name", oldFileName);
+                            }
+                        }
                     }
                 }
                 getAttrMap.putAll(newMap);
+
+                if (!getAttrMap.isEmpty()) {
+                    row.setAttrInfoCaseMap(transformUpperCase(getAttrMap));
+                }
+
+                row.setAttrInfoMap(getAttrMap);
+            }else{
+                List<String> list= Arrays.stream(fieldInfo.split(",")).map(String::trim).collect(Collectors.toList());
+                list.forEach(s -> {
+                    newMap.put(s,"");
+                });
+                if (!newMap.isEmpty()) {
+                    row.setAttrInfoCaseMap(transformUpperCase(newMap));
+                }
+
+                row.setAttrInfoMap(newMap);
             }
 
-            if (getAttrMap != null && !getAttrMap.isEmpty()) {
-                row.setAttrInfoCaseMap(transformUpperCase(getAttrMap));
-            }
-
-            row.setAttrInfoMap(getAttrMap);
         }
     }
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java
index cc1b1f95..781830c4 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java
@@ -387,7 +387,7 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
      */
     private List<TsResource> recursionGetListChildrenStand(TsResource resource,List<TsResource> children){
         List<TsResource> tsResources = children.stream()
-                .filter(resource1 -> resource1.getParentId().equals(resource.getId()))
+                .filter(resource1 -> !children.isEmpty() && StringUtils.isNotBlank(resource1.getParentId()) && resource1.getParentId().equals(resource.getId()))
                 .collect(Collectors.toList());
         if(!tsResources.isEmpty()){
             tsResources = tsResources.stream().sorted(Comparator.comparing(resource1 -> resource1.getDisplaySeq())).collect(Collectors.toList());
diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/InitStandAttrUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/InitStandAttrUtil.java
index c859e95d..f85f9961 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/InitStandAttrUtil.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/InitStandAttrUtil.java
@@ -42,6 +42,7 @@ public class InitStandAttrUtil implements ApplicationRunner {
         standTypeList.add(SarTypeEnum.INLAND_STAND.getValue());
         standTypeList.add(SarTypeEnum.FOREIGN_STAND.getValue());
         lawsTypeList.add(SarTypeEnum.LAWS_STAND.getValue());
+        lawsTypeList.add(SarTypeEnum.FOREIGN_LAWS.getValue());
         standStateList.add("DRAFT");
         standStateList.add("ADVICE");
         standStateList.add("RADYSUBMIT");
@@ -142,6 +143,7 @@ public class InitStandAttrUtil implements ApplicationRunner {
                 } else if (lawsTypeList.contains(sarType)) {
                     if (SarTypeEnum.FOREIGN_LAWS.getValue().equals(sarType)) {
                         lawsForeignAttrFieldList.add(detailsEO);
+                        fieldInfoBuilderLaws.append(detailsEO.getAttrField() + ",");
                     }
                     if (SarTypeEnum.LAWS_STAND.getValue().equals(sarType)) {
                         lawsStandAttrFieldList.add(detailsEO);
@@ -150,7 +152,6 @@ public class InitStandAttrUtil implements ApplicationRunner {
                     if (SarTypeEnum.INLAND_LAWS.getValue().equals(sarType)) {
                         lawsInlandAttrFieldList.add(detailsEO);
                     }
-                    fieldInfoBuilderLaws.append(detailsEO.getAttrField() + ",");
                     fieldInfoNameBuilderLaws.append(detailsEO.getAttrName() + ",");
                     queryFieldListLaws.add(detailsEO.getAttrField());
                     if (StandAttrTypeEnum.SELECT_OPTION.getValue().equals(attrType) || StandAttrTypeEnum.SEL_OPTS.getValue().equals(attrType)) {