From 7e408b4de778506c1544fa8f34ff289dd8b8c8df Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 26 三月 2024 15:27:25 +0800
Subject: [PATCH] #完善工具类
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 81 ++++++++++++++++++++++++++++++++++++----
1 files changed, 72 insertions(+), 9 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 f6c16ae..6112615 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 ? (userId == null? getDeptId().toString(): null) : String.valueOf(deptId)
+ , deptId == null ? null : String.valueOf(deptId)
, 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)
@@ -173,7 +198,7 @@
}
@RequestMapping(value = "/cstmr/add/auth")
- @ManagerAuth(memo = "娣诲姞鐢叉柟鍗曚綅淇℃伅鍏捣")
+ @ManagerAuth(memo = "娣诲姞瀹㈡埛淇℃伅鍏捣")
public R add(Cstmr cstmr) {
if (getUser().getRoleId()!=1){
if (!getUser().getNickname().equals("闄堢嚂")){
@@ -206,32 +231,70 @@
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 = "鎺ュ彇鐢叉柟鍗曚綅")
+ @ManagerAuth(memo = "鎺ュ彇瀹㈡埛淇℃伅")
public R add2(Cstmr cstmr) {
Cstmr cstmr1 = cstmrService.selectByName(getHostId(),cstmr.getName());
if (Cools.isEmpty(cstmr1) || cstmr1.getDirector()!=null){
- return R.error("浣犳棤娉曟帴鍙栨鐢叉柟鍗曚綅!");
+ return R.error("浣犳棤娉曟帴鍙栨瀹㈡埛淇℃伅!");
}
cstmr1.setDirector(getUserId());
+ cstmr1.setDeptId(getDeptId()); // 鎵�灞為儴闂�
+ cstmr1.setUserId(getUserId()); // 鎵�灞炰汉鍛�
+ cstmr1.setUpdateBy(getUserId());
+ cstmr1.setUpdateTime(new Date());
cstmrService.updateById(cstmr1);
return R.ok();
}
@RequestMapping(value = "/cstmr/update/auth")
- @ManagerAuth(memo = "鏇存柊鐢叉柟鍗曚綅")
+ @ManagerAuth(memo = "鏇存柊瀹㈡埛淇℃伅")
public R update(Cstmr cstmr){
if (Cools.isEmpty(cstmr) || null==cstmr.getId()){
return R.error();
}
cstmr.setUpdateBy(getUserId());
cstmr.setUpdateTime(new Date());
+ if (!Cools.isEmpty(cstmr.getDirector())){
+ User director = userService.selectById(cstmr.getDirector());
+ cstmr.setDeptId(director.getDeptId());
+ cstmr.setUserId(director.getId());
+ }
cstmrService.updateById(cstmr);
return R.ok();
}
@RequestMapping(value = "/cstmr/delete/auth")
- @ManagerAuth(memo = "鍒犻櫎鐢叉柟鍗曚綅")
+ @ManagerAuth(memo = "鍒犻櫎瀹㈡埛淇℃伅")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
int order = orderService.selectCount(new EntityWrapper<Order>().eq("cstmr_id", id));
@@ -244,7 +307,7 @@
}
@RequestMapping(value = "/cstmr/delete/one/{id}")
- @ManagerAuth(memo = "鍒犻櫎鐢叉柟鍗曚綅")
+ @ManagerAuth(memo = "鍒犻櫎瀹㈡埛淇℃伅")
public R deleteOne(@PathVariable Long id) {
int cstmr_id = orderService.selectCount(new EntityWrapper<Order>().eq("cstmr_id", id));
if (cstmr_id!=0){
@@ -294,7 +357,7 @@
* excel瀵煎叆
*/
@PostMapping(value = "/cstmr/excel/import/auth")
- @ManagerAuth(memo = "鐢叉柟鍗曚綅Excel瀵煎叆")
+ @ManagerAuth(memo = "瀹㈡埛淇℃伅Excel瀵煎叆")
// @Transactional
public R cstmrExcelImport(MultipartFile file) throws IOException {
InputStream inStream = file.getInputStream();
--
Gitblit v1.9.1