diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java index b996745c..463395de 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java @@ -63,9 +63,8 @@ public class PayManagerManagementController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payManagerManagement, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - IPage pageList = payManagerManagementService.page(page, queryWrapper); + Page pageList = new Page<>(pageNo, pageSize); + pageList = payManagerManagementService.queryWithCondition(pageList,payManagerManagement); return Result.OK(pageList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayManagerManagementMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayManagerManagementMapper.java index fa21e05a..6f5b89d6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayManagerManagementMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayManagerManagementMapper.java @@ -1,7 +1,11 @@ package com.jero.company.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.company.entity.PayManagerManagement; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.data.repository.query.Param; + +import java.util.List; /** * @Description: 企业管理员管理 @@ -11,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface PayManagerManagementMapper extends BaseMapper { + List queryWtihCondition(Page page, @Param("manager")PayManagerManagement payManagerManagement); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayManagerManagementMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayManagerManagementMapper.xml index df4d3eee..69ef01f2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayManagerManagementMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayManagerManagementMapper.xml @@ -27,4 +27,55 @@ + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayManagerManagementService.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayManagerManagementService.java index f11c6d7a..783912fc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayManagerManagementService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayManagerManagementService.java @@ -1,5 +1,6 @@ package com.jero.company.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.company.entity.PayManagerManagement; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.company.vo.CompanyManagerLoginVO; @@ -49,4 +50,6 @@ public interface IPayManagerManagementService extends IService queryWithCondition(Page page, PayManagerManagement payManagerManagement); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayManagerManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayManagerManagementServiceImpl.java index 7e0866c4..e2e91579 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayManagerManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayManagerManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.jero.company.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.util.JwtUtil; @@ -34,6 +35,8 @@ public class PayManagerManagementServiceImpl extends ServiceImpl queryWithCondition(Page page, PayManagerManagement payManagerManagement) { + //TODO 手机号加密 + List list= payManagerManagementMapper.queryWtihCondition(page,payManagerManagement); + page.setRecords(list); + return page; + } }