合并分支 'dev_lkg_0604' 到 'event_fusion'

研究中心-文件上传bug（资讯id要在前面拼上专题id）修改

查看合并请求 !3

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

@@ -956,7 +956,7 @@ public class InformationServiceImpl implements InformationService {
 
             try {
                 SpecialInformation specialInformation = new SpecialInformation();
-                specialInformation.setId(codeGenerateUtil.geneIdNo(Constants.DATA_ADD_ID, 8));
+                specialInformation.setId(subjectId + codeGenerateUtil.geneIdNo(Constants.DATA_ADD_ID, 8));
                 //判断正文是否为空
                 if (StringUtils.isEmpty(info.get(3))) {
                     ClbFileOperationLogDetails clbFileOperationLogDetails = clbFileOperationLogDetailsService.buildFailDetails(info.get(1), info.get(5), info.get(7), "资讯内容为空");
@@ -1038,7 +1038,7 @@ public class InformationServiceImpl implements InformationService {
             List<SpecialInformation> dataList = new ArrayList<>();
             for (FileDataVO info : lists) {
                 SpecialInformation specialInformation = new SpecialInformation();
-                specialInformation.setId(codeGenerateUtil.geneIdNo(Constants.DATA_ADD_ID, 8));
+                specialInformation.setId(subjectId + codeGenerateUtil.geneIdNo(Constants.DATA_ADD_ID, 8));
                 if (StringUtils.isNotEmpty(info.getTitle())) {
                     specialInformation.setTitle(info.getTitle());
                 }