ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

浏览记录提示语更改

Browse Source
This commit is contained in:
caozhen
2023-09-14 17:58:50 +08:00
parent 4e3002800b
commit d20941ea66
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java
+8 -6
View File
@@ -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!" : "批量删除成功!");
}
}
laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java
+1
View File
@@ -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");