From 65862c0f9d9449937cf17151d9462f25b3a49474 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 26 七月 2023 09:40:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java
index 5f3ee66..16f92b1 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java
@@ -40,7 +40,17 @@
}
@Override
- public Page<Cstmr> getPage(Page<Cstmr> page, Long hostId, String deptId, Long userId, String condition) {
+ public Page<Cstmr> getPage2(Page<Cstmr> page, Long hostId, Long deptId, Long userId,Long roleId, String conditionName, String condition) {
+ return page.setRecords(baseMapper.listByPage2(page, hostId, deptId, userId,roleId,conditionName, condition));
+ }
+
+ @Override
+ public Page<Cstmr> getPage1(Page<Cstmr> page, Long hostId, String deptId, Long userId,String conditionName, String condition) {
+ return page.setRecords(baseMapper.listByPage1(page, hostId, deptId, userId,conditionName, condition));
+ }
+
+ @Override
+ public Page<Cstmr> getPage(Page<Cstmr> page, Long hostId, String deptId, Long userId, String condition) {
return page.setRecords(baseMapper.listByPage(page, hostId, deptId, userId, condition));
}
--
Gitblit v1.9.1