From 0da2cb2484d5912d26d7bd4a36835fee1f7a0f26 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 29 Dec 2023 13:47:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(asms):=20=E5=90=8C=E6=AD=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../asms/service/impl/LawsAsmsOpenApiServiceImpl.java     | 8 ++++++--
 .../asms/service/impl/SynchronizationAsmsService.java     | 1 +
 .../com/jero/modules/docking/asms/util/AsmsPostUtil.java  | 3 ---
 .../documenttool/controller/DocumentSplitController.java  | 1 -
 .../service/impl/DocumentSplitServiceImpl.java            | 4 +++-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java
index 1a122485..b7c52565 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java
@@ -207,7 +207,7 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
 
 		lawsAsmsOpenApiList.forEach(lawsAsmsOpenApi -> {
 
-			Map<String, String> map = null;
+			Map<String, String> map = new HashMap<>();
 			if (StringUtils.isNotBlank(lawsAsmsOpenApi.getQueryParamJson())) {
 				map = (Map<String, String>) JSON.parse(lawsAsmsOpenApi.getQueryParamJson());
 			}
@@ -573,7 +573,9 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
 					queryWrapper1.eq(OSSFile::getStandardFileType, "publish_of_original");
 					queryWrapper1.like(OSSFile::getFileName, ".docx");
 					OSSFile ossFile = ossFileService.getOne(queryWrapper1);
-
+					if (Objects.isNull(ossFile)){
+						return;
+					}
 					SarFileSplitInfoEO sarFileSplitInfoEO = new SarFileSplitInfoEO();
 					sarFileSplitInfoEO.setStandardId(lawsDomesticStandard.getId());
 					sarFileSplitInfoEO.setSerialNumber(lawsDomesticStandard.getStandardNumber());
@@ -585,6 +587,8 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
 					sarFileSplitInfoEO.setCreateTime(getSimpleDate2(eMap.get("createTime")));
 					sarFileSplitInfoEO.setUpdateTime(getSimpleDate2(eMap.get("updateTime")));
 					sarFileSplitInfoEO.setIsAsmsImport("1");
+					sarFileSplitInfoEO.setAuthor("云平台");
+					sarFileSplitInfoEO.setSplitResult("成功");
 
 					sarFileSplitInfoService.save(sarFileSplitInfoEO);
 				});
diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java
index 29995176..76f19a91 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java
@@ -341,6 +341,7 @@ public class SynchronizationAsmsService {
                 sarFileSplitInfoEO.setUpdateTime(getSimpleDate2(eMap.get("updateTime")));
                 sarFileSplitInfoEO.setIsAsmsImport("1");
                 sarFileSplitInfoEO.setAuthor("云平台");
+                sarFileSplitInfoEO.setSplitResult("成功");
 
                 sarFileSplitInfoEO.setId(UUIDUtils.randomUUID20());
 
diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/util/AsmsPostUtil.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/util/AsmsPostUtil.java
index 28ed0123..c32a777b 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/util/AsmsPostUtil.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/util/AsmsPostUtil.java
@@ -16,10 +16,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
 import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
-import java.nio.file.Files;
 import java.util.*;
 
 /**
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
index ff463a8f..cd39224d 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
@@ -1,6 +1,5 @@
 package com.jero.modules.laws.documenttool.controller;
 
-import cn.hutool.core.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
index c5ebff6b..b20fa959 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
@@ -1360,10 +1360,12 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
         }
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         // 发布的只有自己可见，发布的数据所有人可见
+        String roleIds = loginUser.getRoleIds();
         queryWrapper.and(qw ->
                 qw.and(qwi -> qwi.eq(SPLIT_STATUS, DocumentSplitCommon.SPLIT_STATUS1)
                                 .eq("author", loginUser.calcNameWorkNo()))
-                        .or().eq(SPLIT_STATUS, DocumentSplitCommon.SPLIT_STATUS2));
+                        .or().eq(SPLIT_STATUS, DocumentSplitCommon.SPLIT_STATUS2)
+                            .or().eq(roleIds.contains("admin"), "author", "云平台"));
         // 逻辑删除
         queryWrapper.eq("del_flag", 0);
         // 排序