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/CstmrService.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/service/CstmrService.java b/src/main/java/com/zy/crm/manager/service/CstmrService.java
index e86f830..4576200 100644
--- a/src/main/java/com/zy/crm/manager/service/CstmrService.java
+++ b/src/main/java/com/zy/crm/manager/service/CstmrService.java
@@ -8,8 +8,14 @@
Cstmr selectByUuid(Long hostId, String uuid);
- String getNextUuid(Long hostId);
+ String getUuid(Long hostId);
- Page<Cstmr> getPage(Page page, Long hostId, String deptId, Object condition);
+ Page<Cstmr> getPage2(Page<Cstmr> page, Long hostId, Long deptId, Long userId,Long roleId, String conditionName, String condition);
+ Page<Cstmr> getPage1(Page<Cstmr> page, Long hostId, String deptId, Long userId, String conditionName, String condition);
+ Page<Cstmr> getPage(Page<Cstmr> page, Long hostId, String deptId, Long userId, String condition);
+
+ int updateDeptIdByUserId(Long userId, Long deptId);
+
+ Cstmr selectByName(Long hostId, String name);
}
--
Gitblit v1.9.1