From ba14a32fa24dee659d772fbf7df646a60e4d76cc Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Mon, 8 Jan 2024 17:22:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83):=2079?=
 =?UTF-8?q?957?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsStandardizationServiceImpl.java  | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
index 22ecd316..448f2ae8 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
@@ -161,20 +161,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 						.notIn(OSSFile::getId, meetingDataList));
 
 				// 同步文件到资料中心
-				for (String meetingData : meetingDataList) {
-					LawsDataCenterFile lawsDataCenterFile = new LawsDataCenterFile();
-					lawsDataCenterFile.setFileId(meetingData);
-					// XXX（分标委名称）- XXXX（工作组名称）-会议资料
-					lawsDataCenterFile.setFileDescription(getFileDescription(lawsStandardization));
-					lawsDataCenterFile.setCreateBy(standardizationMeeting.getCreateBy());
-					List<SysDepart> sysDeparts = sysDepartService.queryDepartsByUsername(standardizationMeeting.getCreateBy());
-					SysUser sysUser = sysUserService.getUserByName(standardizationMeeting.getCreateBy());
-					List<String> orgCodeList = sysDeparts.stream().map(SysDepart::getOrgCode).collect(Collectors.toList());
-					lawsDataCenterFile.setOwnerId(Objects.isNull(sysUser) ? loginUser.getId() : sysUser.getId());
-					lawsDataCenterFile.setUploader(Objects.isNull(sysUser) ? loginUser.calcNameWorkNo() : sysUser.calcNameWorkNo());
-					lawsDataCenterFile.setOrgCode(String.join(",", orgCodeList));
-					lawsDataCenterFileService.add(lawsDataCenterFile);
-				}
+				toDataCentre(lawsStandardization, loginUser, standardizationMeeting, meetingDataList);
 			} else {
 				// 删除旧文件
 				ossFileService.remove(new LambdaQueryWrapper<OSSFile>()
@@ -186,7 +173,24 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 		lawsStandardizationMeetingService.saveOrUpdateBatch(standardizationMeetingList);
 	}
 
-	private String getFileDescription(LawsStandardization lawsStandardization) {
+	private void toDataCentre(LawsStandardization lawsStandardization, LoginUser loginUser, LawsStandardizationMeeting standardizationMeeting, List<String> meetingDataList) {
+		for (String meetingData : meetingDataList) {
+			LawsDataCenterFile lawsDataCenterFile = new LawsDataCenterFile();
+			lawsDataCenterFile.setFileId(meetingData);
+			// XXX（分标委名称）- XXXX（工作组名称）-会议资料
+			lawsDataCenterFile.setFileDescription(getFileDescription(lawsStandardization, standardizationMeeting.getName()));
+			lawsDataCenterFile.setCreateBy(standardizationMeeting.getCreateBy());
+			List<SysDepart> sysDeparts = sysDepartService.queryDepartsByUsername(standardizationMeeting.getCreateBy());
+			SysUser sysUser = sysUserService.getUserByName(standardizationMeeting.getCreateBy());
+			List<String> orgCodeList = sysDeparts.stream().map(SysDepart::getOrgCode).collect(Collectors.toList());
+			lawsDataCenterFile.setOwnerId(Objects.isNull(sysUser) ? loginUser.getId() : sysUser.getId());
+			lawsDataCenterFile.setUploader(Objects.isNull(sysUser) ? loginUser.calcNameWorkNo() : sysUser.calcNameWorkNo());
+			lawsDataCenterFile.setOrgCode(String.join(",", orgCodeList));
+			lawsDataCenterFileService.add(lawsDataCenterFile);
+		}
+	}
+
+	private String getFileDescription(LawsStandardization lawsStandardization, String name) {
 		// 树形结构
 		LawsStandardization treeList = queryTreeList();
 		// 拆开为list结构
@@ -212,7 +216,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 		if (stringBuilder.length() > 0){
 			stringBuilder.append("-");
 		}
-		return stringBuilder.append("会议资料").toString();
+		return stringBuilder.append(name).toString();
 	}
 
 	private void getNodeName(LawsStandardization lawsStandardization, List<LawsStandardization> list, StringBuilder  stringBuilder) {