From ac0f76b476eb7ac11962eb44e1742f7bb4a7d697 Mon Sep 17 00:00:00 2001 From: caozhen <18736171426@139.com> Date: Mon, 18 Sep 2023 16:31:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LawsBrowsingHistoryController.java | 4 +++- .../LawsStandardCollectionController.java | 13 +++++++------ .../controller/LawsStandardSharingController.java | 3 ++- .../controller/LawsAssessController.java | 2 +- .../controller/LawsProjectLibraryController.java | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java index 6f15cfaf..bf311df2 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java @@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.ResultCommon; @@ -91,9 +92,10 @@ public class LawsBrowsingHistoryController extends JeroController deleteBatch(@RequestBody Map map) { if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ - return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!"); + throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); } this.lawsBrowsingHistoryService.removeByIds(Arrays.asList(map.get("ids").split(","))); return Result.error(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK)); } + } diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java index f25a244b..91487f90 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java @@ -5,13 +5,14 @@ import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.ResultCommon; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandard; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardService; import com.jero.modules.laws.standard.entity.LawsDomesticStandard; +import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.entity.LawsOverseasStandard; +import com.jero.modules.laws.standard.service.EnterpriseStandardService; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; import com.jero.modules.personal.entity.LawsStandardCollection; @@ -100,7 +101,7 @@ public class LawsStandardCollectionController extends JeroController domesticDelete(@RequestBody Map map) { if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!"); + throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); } lawsStandardCollectionService.deleteById(map.get("id")); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); @@ -152,7 +153,7 @@ public class LawsStandardCollectionController extends JeroController enterpriseAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) { - EnterpriseStandard standard = enterpriseStandardService.getById(lawsStandardCollection.getStandardId()); + LawsEnterpriseStandard standard = enterpriseStandardService.getById(lawsStandardCollection.getStandardId()); lawsStandardCollection.setStandardClass(standard.getCategoryCode()); lawsStandardCollection.setStandardName(standard.getStandardName()); @@ -177,7 +178,7 @@ public class LawsStandardCollectionController extends JeroController enterpriseDelete(@RequestBody Map map) { if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!"); + throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); } lawsStandardCollectionService.deleteById(map.get("id")); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); @@ -191,7 +192,7 @@ public class LawsStandardCollectionController extends JeroController delete(@RequestBody Map map) { if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!"); + throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); } lawsStandardCollectionService.removeById(map.get("id")); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java index 1845f55a..bb237fc6 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java @@ -3,6 +3,7 @@ package com.jero.modules.personal.controller; import java.util.*; import javax.servlet.http.HttpServletRequest; import com.jero.common.api.vo.Result; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.ResultCommon; @@ -204,7 +205,7 @@ public class LawsStandardSharingController extends JeroController deleteBatch(@RequestBody Map map) { if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ - return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!"); + throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); } this.lawsStandardSharingService.deleteByIds(Arrays.asList(map.get("ids").split(","))); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java index 4de91c83..1e8586e8 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java @@ -262,7 +262,7 @@ public class LawsAssessController extends JeroController