From cb3870820f63e6f7ba595d80dcbbfd3deae6fdf6 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 07 十一月 2023 17:49:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 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 0468066..9beaad8 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -118,10 +118,23 @@
}
}
+
+ Long director = null;
+ if (deptId==null && userId == null){
+ if (getRole().getId()==3){
+ userId = getUserId();
+ }else if (getRole().getId()==2){
+ deptId = getDeptId();
+ userId = null;
+ }
+// director = getUserId();
+ }
+
return R.ok(cstmrService.getPage3(new Page<>(curr, limit)
, getHostId()
, deptId == null ? null : String.valueOf(deptId)
- , userId == null ? getUserId() : userId
+ , userId
+ , director
, Cools.isEmpty(followerName) ? null : ids
, conditionName
, condition)
@@ -162,10 +175,22 @@
}
}
+ Long director = null;
+ if (deptId==null && userId == null){
+ if (getRole().getId()==3){
+ userId = getUserId();
+ }else if (getRole().getId()==2){
+ deptId = getDeptId();
+ userId = null;
+ }
+ director = getUserId();
+ }
+
return R.ok(cstmrService.getPage33(new Page<>(curr, limit)
, getHostId()
, deptId == null ? null : String.valueOf(deptId)
- , userId == null ? getUserId() : userId
+ , userId
+ , director
, Cools.isEmpty(followerName) ? null : ids
, conditionName
, condition)
@@ -206,6 +231,35 @@
return R.ok();
}
+ @RequestMapping(value = "/cstmr/add2/auth")
+ @ManagerAuth(memo = "娣诲姞鐢叉柟鍗曚綅淇℃伅鍏捣")
+ public R add22(Cstmr cstmr) {
+ Long hostId = getHostId();
+ if (cstmrService.selectByUuid(hostId, cstmr.getUuid()) != null) {
+ throw new CoolException("瀹㈡埛宸插瓨鍦�");
+ }
+ if (cstmrService.selectByName(hostId, cstmr.getName()) != null) {
+ throw new CoolException("瀹㈡埛宸插瓨鍦�");
+ }
+ Cstmr cstmr1 = cstmrService.selectByName(hostId, cstmr.getName());
+ if (cstmr1!=null){
+ throw new CoolException("璇ュ鎴蜂俊鎭凡瀛樺湪锛屼笟鍔″憳鏄�:"+cstmr1.getDirector$());
+ }
+ cstmr.setHostId(hostId);
+ cstmr.setUuid(cstmrService.getUuid(hostId)); // 瀹㈡埛浠ｅ彿
+ cstmr.setDeptId(getDeptId()); // 鎵�灞為儴闂�
+ cstmr.setUserId(getUserId()); // 鎵�灞炰汉鍛�
+
+ cstmr.setCreateBy(getUserId());
+ cstmr.setCreateTime(new Date());
+ cstmr.setUpdateBy(getUserId());
+ cstmr.setUpdateTime(new Date());
+ cstmr.setDirector(getUserId());
+ cstmr.setStatus(1);
+ cstmrService.insert(cstmr);
+ return R.ok();
+ }
+
@RequestMapping(value = "/cstmr2/add/auth")
@ManagerAuth(memo = "鎺ュ彇鐢叉柟鍗曚綅")
public R add2(Cstmr cstmr) {
@@ -214,6 +268,10 @@
return R.error("浣犳棤娉曟帴鍙栨鐢叉柟鍗曚綅!");
}
cstmr1.setDirector(getUserId());
+ cstmr.setDeptId(getDeptId()); // 鎵�灞為儴闂�
+ cstmr.setUserId(getUserId()); // 鎵�灞炰汉鍛�
+ cstmr.setUpdateBy(getUserId());
+ cstmr.setUpdateTime(new Date());
cstmrService.updateById(cstmr1);
return R.ok();
}
--
Gitblit v1.9.1