From d20941ea6664ce7ec8988a7407edd2b16f48e7d4 Mon Sep 17 00:00:00 2001
From: caozhen <18736171426@139.com>
Date: Thu, 14 Sep 2023 17:58:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8F=E8=A7=88=E8=AE=B0=E5=BD=95=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LawsBrowsingHistoryController.java  | 14 ++++++++------
 .../impl/LawsStandardSharingServiceImpl.java       |  1 +
 2 files changed, 9 insertions(+), 6 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 a80bed07..e6969a91 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
@@ -7,6 +7,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.LawsBrowsingHistory;
 import com.jero.modules.personal.service.ILawsBrowsingHistoryService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -61,21 +63,21 @@ public class LawsBrowsingHistoryController extends JeroController<LawsBrowsingHi
 	@PostMapping(value = "/add")
 	public Result<T> add(@Validated @RequestBody LawsBrowsingHistory lawsBrowsingHistory) {
 		lawsBrowsingHistoryService.add(lawsBrowsingHistory);
-		return Result.OK("操作成功!");
+		return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!");
 	}
 
 	 /**
 	  *   全部删除
 	  */
-	 @AutoLog(value = "浏览记录-全部删除")
-	 @ApiOperation(value="浏览记录-全部删除", notes="浏览记录-全部删除")
+	 @AutoLog(value = "浏览记录-清除浏览记录")
+	 @ApiOperation(value="浏览记录-清除浏览记录", notes="浏览记录-清除浏览记录")
 	 @PostMapping(value = "/delete")
 	 public Result<T> delete() {
 		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		 LambdaQueryWrapper<LawsBrowsingHistory> wrapper = new LambdaQueryWrapper<>();
 		 wrapper.eq(LawsBrowsingHistory::getBrowsingUserId, sysUser.getId());
 		 lawsBrowsingHistoryService.remove(wrapper);
-		 return Result.OK("删除成功!");
+		 return Result.OK(MessageUtils.getLanguage().equals("EN") ? "Successfully cleared!" : "清除成功!");
 	 }
 
 	 /**
@@ -86,9 +88,9 @@ public class LawsBrowsingHistoryController extends JeroController<LawsBrowsingHi
 	 @PostMapping(value = "/deleteBatch")
 	 public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
 		 if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
-			 return Result.error("请选择数据!");
+			 return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!");
 		 }
 		 this.lawsBrowsingHistoryService.removeByIds(Arrays.asList(map.get("ids").split(",")));
-		 return Result.OK("批量删除成功!");
+		 return Result.OK(MessageUtils.getLanguage().equals("EN") ? "Successfully deleted in bulk!" : "批量删除成功!");
 	 }
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java
index d10b0df0..a57671e1 100644
--- a/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java
@@ -41,6 +41,7 @@ public class LawsStandardSharingServiceImpl extends ServiceImpl<LawsStandardShar
                         HttpServletRequest req) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         LambdaQueryWrapper<LawsStandardSharing> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(lawsStandardSharing.getSource()), LawsStandardSharing::getSource, lawsStandardSharing.getSource());
         wrapper.eq(StringUtils.isNotBlank(lawsStandardSharing.getStandardId()), LawsStandardSharing::getSharerId, sysUser.getId());
         wrapper.eq(StringUtils.isNotBlank(lawsStandardSharing.getRecipientId()), LawsStandardSharing::getRecipientId, sysUser.getId());
         wrapper.eq(LawsStandardSharing::getDelFlag, "0");