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 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 delete() { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LambdaQueryWrapper 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 deleteBatch(@RequestBody Map 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 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");