专题数据导出时，动态标签bug处理

src/main/java/com/zzsn/event/controller/FileController.java

@@ -518,8 +518,10 @@ public class FileController {
     private List<String> supplyHeaders(String[] arr, List<LabelModelVo> labelTypeVos) {
         List<String> headers = new ArrayList<>(Arrays.asList(arr));
         if (CollectionUtils.isNotEmpty(labelTypeVos)) {
-            for (LabelModelVo labelTypeVo : labelTypeVos) {
+            for (int i = 0; i < labelTypeVos.size(); i++) {
+                LabelModelVo labelTypeVo = labelTypeVos.get(i);
                 headers.add(labelTypeVo.getLabelName());
+                labelTypeVo.setOrderNo(i);
             }
         }
         return headers;
@@ -669,7 +671,6 @@ public class FileController {
                             data.add(sb.substring(1));
                         }
                     }
-
             }
             list.add(data);
         }

src/main/java/com/zzsn/event/service/impl/CommonServiceImpl.java

@@ -48,6 +48,8 @@ public class CommonServiceImpl implements CommonService {
     private SubjectKeywordsService subjectKeywordsService;
     @Autowired
     private ObsUtil obsUtil;
+    @Autowired
+    private SubjectDictMapService subjectDictMapService;
 
 
     @Override
@@ -299,7 +301,24 @@ public class CommonServiceImpl implements CommonService {
 
     @Override
     public List<LabelModelVo> subjectModelBindLabels(List<String> subjectIds) {
-        return commonMapper.subjectModelBindLabels(subjectIds);
+        Set<LabelModelVo> dataSet = new HashSet<>();
+        List<DictVO> allList = new ArrayList<>();
+        for (String subjectId : subjectIds) {
+            List<DictVO> boundList = subjectDictMapService.boundList(subjectId);
+            allList.addAll(boundList);
+        }
+        for (DictVO dictVO : allList) {
+            LabelModelVo labelModelVo = new LabelModelVo();
+            labelModelVo.setLabelName(dictVO.getName());
+            String labelMark = StringUtils.isEmpty(dictVO.getLabelMark()) ? dictVO.getCode() : dictVO.getLabelMark();
+            if ("enterprise".equals(labelMark)) {
+                labelModelVo.setLabelMark("company_label");
+            } else {
+                labelModelVo.setLabelMark(labelMark);
+            }
+            dataSet.add(labelModelVo);
+        }
+        return new ArrayList<>(dataSet);
     }
 
     @Override