From cbc9250b33a955bc919a6afc5d4101ef65bbfafa Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 12:53:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 c206eea..0a38ccc 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
@@ -47,25 +47,25 @@
}
@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));
+ public Page<Cstmr> getPage1(Page<Cstmr> page, Long hostId, String deptId, Long userId, Long director, String conditionName, String condition) {
+ return page.setRecords(baseMapper.listByPage1(page, hostId, deptId, userId, director, conditionName, condition));
}
@Override
- public Page<Cstmr> getPage3(Page<Cstmr> page, Long hostId, String deptId, Long userId, List<Integer> cstmrIds, String conditionName, String condition) {
+ public Page<Cstmr> getPage3(Page<Cstmr> page, Long hostId, String deptId, Long userId, Long director, List<Integer> cstmrIds, String conditionName, String condition) {
if (cstmrIds==null){
- return page.setRecords(baseMapper.listByPage1(page, hostId, deptId, userId,conditionName, condition));
+ return page.setRecords(baseMapper.listByPage1(page, hostId, deptId, userId, director,conditionName, condition));
}else {
- return page.setRecords(baseMapper.listByPage3(page, hostId, deptId, userId,cstmrIds,conditionName, condition));
+ return page.setRecords(baseMapper.listByPage3(page, hostId, deptId, userId, director,cstmrIds,conditionName, condition));
}
}
@Override
- public Page<Cstmr> getPage33(Page<Cstmr> page, Long hostId, String deptId, Long userId, List<Integer> cstmrIds, String conditionName, String condition) {
+ public Page<Cstmr> getPage33(Page<Cstmr> page, Long hostId, String deptId, Long userId, Long director, List<Integer> cstmrIds, String conditionName, String condition) {
if (cstmrIds==null){
- return page.setRecords(baseMapper.listByPage11(page, hostId, deptId, userId,conditionName, condition));
+ return page.setRecords(baseMapper.listByPage11(page, hostId, deptId, userId, director,conditionName, condition));
}else {
- return page.setRecords(baseMapper.listByPage33(page, hostId, deptId, userId,cstmrIds,conditionName, condition));
+ return page.setRecords(baseMapper.listByPage33(page, hostId, deptId, userId, director,cstmrIds,conditionName, condition));
}
}
--
Gitblit v1.9.1