diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java index 8a2156d3..dd4674fb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java @@ -13,7 +13,11 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.DictModel; +import com.jero.common.system.vo.LoginUser; import com.jero.common.util.ValidUtil; +import com.jero.company.entity.PayCompanyManagement; +import com.jero.company.entity.PayContactsManagement; +import com.jero.company.service.IPayContactsManagementService; import com.jero.member.entity.PayMemberProjectSubitem; import com.jero.member.service.IPayMemberProjectSubitemService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -22,6 +26,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.member.vo.PayMemberProjectSubitemExcel; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; +import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; @@ -45,6 +50,8 @@ public class PayMemberProjectSubitemController extends JeroController queryPageListCompany(PayMemberProjectSubitem payMemberProjectSubitem, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String userId = loginUser.getId(); + PayContactsManagement contactsManagement = contactsManagementService.getById(userId); + payMemberProjectSubitem.setCompanyId(contactsManagement.getCompanyId()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMemberProjectSubitem, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = memberProjectSubitemService.page(page, queryWrapper); + return Result.OK(pageList); + } + /** * 列表查询 */ @@ -74,6 +100,8 @@ public class PayMemberProjectSubitemController extends JeroController