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>> queryDocumentSplitDetail(@RequestBody Map parameter) { - return Result.OK(documentSplitService.queryDocumentSplitDetail(parameter)); + try { + IPage> 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 editBatchDocumentSplitDetail(@RequestBody Map 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 parameterMap = JSONObject.parseObject(parameter); - fileSplitItemsEOService.exportSplitInfo(cut, idList, parameterMap, exportName, response, request); + try { + Map parameterMap = JSONObject.parseObject(parameter); + fileSplitItemsEOService.exportSplitInfo(cut, idList, parameterMap, exportName, response, request); + }catch (Exception e){ + throw new JeroBootException(MessageUtils.getMessage(ResultCommon.ERROR)); + } } @ApiOperation(value = "文档拆分条款信息-导入拆分结果")