From e9bd81174669058dfc5a0d3fb6282d22de7497d1 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 01 十一月 2023 15:44:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 12 +++++++++++-
src/main/java/com/zy/crm/manager/controller/PlanController.java | 4 ++--
src/main/java/com/zy/crm/manager/controller/OrderController.java | 4 ++--
3 files changed, 15 insertions(+), 5 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 fc4669f..0468066 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -88,6 +88,11 @@
@RequestParam(required = false) String condition,
@RequestParam(required = false, value = "dept_id") Long deptId,
@RequestParam(required = false, value = "user_id") Long userId){
+ if (getUser().getRoleId()!=1){
+ if (!getUser().getNickname().equals("闄堢嚂")){
+ return R.ok(new Page<Cstmr>());
+ }
+ }
List<Integer> ids = new ArrayList<>();
if (!Cools.isEmpty(followerName)){
User username = userService.selectOne(new EntityWrapper<User>().eq("username", followerName));
@@ -168,8 +173,13 @@
}
@RequestMapping(value = "/cstmr/add/auth")
- @ManagerAuth(memo = "娣诲姞鐢叉柟鍗曚綅")
+ @ManagerAuth(memo = "娣诲姞鐢叉柟鍗曚綅淇℃伅鍏捣")
public R add(Cstmr cstmr) {
+ if (getUser().getRoleId()!=1){
+ if (!getUser().getNickname().equals("闄堢嚂")){
+ return R.error("鎮ㄦ病鏈夋坊鍔犳潈闄�");
+ }
+ }
Long hostId = getHostId();
if (cstmrService.selectByUuid(hostId, cstmr.getUuid()) != null) {
throw new CoolException("瀹㈡埛宸插瓨鍦�");
diff --git a/src/main/java/com/zy/crm/manager/controller/OrderController.java b/src/main/java/com/zy/crm/manager/controller/OrderController.java
index e599f10..184c8c7 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -66,8 +66,8 @@
}
return R.ok(orderService.getPage(new Page<>(curr, limit)
, getHostId()
- , deptId == null ? null : String.valueOf(deptId)
- , userId == null ? getUserId() : userId
+ , deptId == null ? (userId == null? getDeptId().toString(): null) : String.valueOf(deptId)
+ , userId
, condition
, status)
);
diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java
index f90a914..9a10e54 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -91,8 +91,8 @@
@RequestParam(required = false, value = "user_id") Long userId) {
return R.ok(planService.getPage(new Page<>(curr, limit)
, getHostId()
- , deptId == null ? null : String.valueOf(deptId)
- , userId == null ? getUserId() : userId
+ , deptId == null ? (userId == null? getDeptId().toString(): null) : String.valueOf(deptId)
+ , userId
, condition)
);
}
--
Gitblit v1.9.1