From 20c1a4c66e02721eadc833cadbfc7c06a42c9412 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 17 Nov 2023 17:38:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):=2078?=
 =?UTF-8?q?544?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DocumentSplitController.java      | 16 +++++++++++++---
 .../controller/FileSplitItemsEOController.java   | 11 +++++++++--
 2 files changed, 22 insertions(+), 5 deletions(-)

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 76e8223b..bdd1dfad 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
@@ -206,7 +206,12 @@ public class DocumentSplitController {
     @PostMapping("/queryDocumentSplitDetail")
     @RequiresPermissions("split:sarFileSplitItems:search")
     public Result<IPage<Map<String,Object>>> queryDocumentSplitDetail(@RequestBody Map<String, Object> parameter) {
-        return Result.OK(documentSplitService.queryDocumentSplitDetail(parameter));
+        try {
+            IPage<Map<String, Object>> data = documentSplitService.queryDocumentSplitDetail(parameter);
+            return Result.OK(data);
+        }catch (Exception e){
+            return Result.error(MessageUtils.getMessage(ResultCommon.ERROR));
+        }
     }
 
     /**
@@ -269,8 +274,13 @@ public class DocumentSplitController {
     @PostMapping("/editBatchDocumentSplitDetail")
     @RequiresPermissions("split:sarFileSplitItems:batchDelete")
     public Result<T> editBatchDocumentSplitDetail(@RequestBody Map<String, Object> parameter) {
-        documentSplitService.editBatchDocumentSplitDetail(parameter);
-        return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
+        try {
+            documentSplitService.editBatchDocumentSplitDetail(parameter);
+            return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
+        }
+        catch (Exception e){
+            return Result.error(MessageUtils.getMessage(ResultCommon.ERROR));
+        }
     }
 
     /**
diff --git a/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java b/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java
index 88040a78..d43999d8 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java
@@ -4,8 +4,11 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.common.api.vo.Result;
+import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.util.MessageUtils;
 import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.split.entity.SarFileSplitInfoEO;
 import com.jero.modules.split.entity.SarFileSplitItemsEO;
@@ -215,8 +218,12 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
                                    @RequestParam(value = "parameter") String parameter,
                                    HttpServletResponse response,
                                    HttpServletRequest request) {
-        Map<String, Object> parameterMap = JSONObject.parseObject(parameter);
-        fileSplitItemsEOService.exportSplitInfo(cut, idList, parameterMap, exportName, response, request);
+        try {
+            Map<String, Object> parameterMap = JSONObject.parseObject(parameter);
+            fileSplitItemsEOService.exportSplitInfo(cut, idList, parameterMap, exportName, response, request);
+        }catch (Exception e){
+            throw new JeroBootException(MessageUtils.getMessage(ResultCommon.ERROR));
+        }
     }
 
     @ApiOperation(value = "文档拆分条款信息-导入拆分结果")