From c7884cb7dd4b50b1ae37fc956493e577a8535aed Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 25 七月 2023 14:09:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrController.java b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
index b502936..f4ca4a2 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -70,7 +70,6 @@
@RequestParam(required = false) String conditionName,
@RequestParam(required = false) String condition,
@RequestParam(required = false, value = "dept_id") Long deptId,
- @RequestParam(required = false, value = "role_id") Long roleId,
@RequestParam(required = false, value = "user_id") Long userId){
if (!Cools.isEmpty(conditionName)){
switch (conditionName){
@@ -85,11 +84,10 @@
}
}
- return R.ok(cstmrService.getPage2(new Page<>(curr, limit)
+ return R.ok(cstmrService.getPage1(new Page<>(curr, limit)
, getHostId()
- , deptId == null ? userService.selectById(getUserId()).getDeptId() : deptId
+ , deptId == null ? null : String.valueOf(deptId)
, userId == null ? getUserId() : userId
- , roleId == null ? userService.selectById(getUserId()).getRoleId() : roleId
, conditionName
, condition)
);
--
Gitblit v1.9.1