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 b8ea734b..28b4fe45 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 @@ -65,7 +65,7 @@ public class LawsStandardSharingController extends JeroController pageList = lawsStandardSharingService.queryPage(lawsStandardSharing, pageNo, pageSize, req); return Result.OK(pageList); } @@ -82,7 +82,7 @@ public class LawsStandardSharingController extends JeroController pageList = lawsStandardSharingService.queryPage(lawsStandardSharing, pageNo, pageSize, req); return Result.OK(pageList); } 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 08f39bf4..112be0b0 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 @@ -3,10 +3,13 @@ package com.jero.modules.personal.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.personal.entity.LawsStandardCollection; import com.jero.modules.personal.entity.LawsStandardSharing; import com.jero.modules.personal.mapper.LawsStandardSharingMapper; import com.jero.modules.personal.service.ILawsStandardSharingService; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.jero.common.exception.JeroBootException; @@ -36,9 +39,16 @@ public class LawsStandardSharingServiceImpl extends ServiceImpl queryPage(LawsStandardSharing lawsStandardSharing, Integer pageNo, Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsStandardSharing, req.getParameterMap()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + 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"); + if (StringUtils.isNotBlank(lawsStandardSharing.getTitle())){ + wrapper.like(LawsStandardSharing::getStandardNum, lawsStandardSharing.getTitle()).or().like(LawsStandardSharing::getStandardName, lawsStandardSharing.getTitle()); + } Page page = new Page<>(pageNo, pageSize); - Page sharingPage = page(page, queryWrapper); + Page sharingPage = page(page, wrapper); this.assignment(sharingPage.getRecords()); return sharingPage; } @@ -47,7 +57,7 @@ public class LawsStandardSharingServiceImpl extends ServiceImpl