From 06e5c0bc9cdd1e6aea21ee0b9e59b16ef972e99d Mon Sep 17 00:00:00 2001
From: caozhen <18736171426@139.com>
Date: Thu, 14 Sep 2023 17:00:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=94=B6=E8=97=8F=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=80=BC=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsStandardCollectionController.java     | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

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 d852aac4..0bb82a7a 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
@@ -6,6 +6,8 @@ import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.api.vo.Result;
 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.personal.entity.LawsStandardCollection;
 import com.jero.modules.personal.service.ILawsStandardCollectionService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -63,11 +65,11 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
 		wrapper.eq(LawsStandardCollection::getCollectorId, sysUser.getId());
 		int count = lawsStandardCollectionService.count();
 		if (count > 0){
-			return Result.OK("不能重复收藏!");
+			return Result.OK(MessageUtils.getLanguage().equals("EN") ? "Cannot duplicate favorites" : "不能重复收藏!");
 		}
 		lawsStandardCollection.setSource("1");
 		lawsStandardCollectionService.add(lawsStandardCollection);
-		return Result.OK("操作成功!");
+		return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!");
 	}
 
 	/**
@@ -78,10 +80,10 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
 	@PostMapping(value = "/domestic/delete")
 	public Result<T> domesticDelete(@RequestBody Map<String, String> map) {
 	    if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
-            return Result.error("请选择数据!");
+            return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!");
         }
 		lawsStandardCollectionService.deleteById(map.get("id"));
-		return Result.OK("删除成功!");
+		return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!");
 	}
 
 	 /**
@@ -97,11 +99,11 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
 		 wrapper.eq(LawsStandardCollection::getCollectorId, sysUser.getId());
 		 int count = lawsStandardCollectionService.count();
 		 if (count > 0){
-			 return Result.OK("不能重复收藏!");
+			 return Result.OK(MessageUtils.getLanguage().equals("EN") ? "Cannot duplicate favorites" : "不能重复收藏!");
 		 }
 	 	 lawsStandardCollection.setSource("2");
 		 lawsStandardCollectionService.add(lawsStandardCollection);
-		 return Result.OK("操作成功!");
+		 return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!");
 	 }
 
 	 /**
@@ -112,10 +114,10 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
 	 @PostMapping(value = "/overseas/delete")
 	 public Result<T> overseasDelete(@RequestBody Map<String, String> map) {
 		 if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
-			 return Result.error("请选择数据!");
+			 return Result.OK(MessageUtils.getLanguage().equals("EN") ? "Cannot duplicate favorites" : "不能重复收藏!");
 		 }
 		 lawsStandardCollectionService.deleteById(map.get("id"));
-		 return Result.OK("删除成功!");
+		 return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!");
 	 }
 
 	 /**
@@ -131,11 +133,11 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
 		 wrapper.eq(LawsStandardCollection::getCollectorId, sysUser.getId());
 		 int count = lawsStandardCollectionService.count();
 		 if (count > 0){
-			 return Result.OK("不能重复收藏!");
+			 return Result.OK(MessageUtils.getLanguage().equals("EN") ? "Cannot duplicate favorites" : "不能重复收藏!");
 		 }
 	 	 lawsStandardCollection.setSource("3");
 		 lawsStandardCollectionService.add(lawsStandardCollection);
-		 return Result.OK("操作成功!");
+		 return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!");
 	 }
 
 	 /**
@@ -146,10 +148,10 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
 	 @PostMapping(value = "/enterprise/delete")
 	 public Result<T> enterpriseDelete(@RequestBody Map<String, String> map) {
 		 if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
-			 return Result.error("请选择数据!");
+			 return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!");
 		 }
 		 lawsStandardCollectionService.deleteById(map.get("id"));
-		 return Result.OK("删除成功!");
+		 return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!");
 	 }
 
 	 /**
@@ -160,10 +162,10 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
 	 @PostMapping(value = "/delete")
 	 public Result<T> delete(@RequestBody Map<String, String> map) {
 		 if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
-			 return Result.error("请选择数据!");
+			 return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!");
 		 }
 		 lawsStandardCollectionService.removeById(map.get("id"));
-		 return Result.OK("删除成功!");
+		 return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!");
 	 }
 
 }