From 3fc935a8b53708a4402e24bf4086741f684bbd35 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 14 九月 2023 16:17:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 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 1f0cfd4..8694fa1 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -16,9 +16,12 @@
import com.zy.crm.manager.entity.Cstmr;
import com.zy.crm.manager.entity.CstmrFoll;
import com.zy.crm.manager.entity.CstmrType;
+import com.zy.crm.manager.entity.Order;
import com.zy.crm.manager.service.CstmrFollService;
import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.manager.service.CstmrTypeService;
+import com.zy.crm.manager.service.OrderService;
+import com.zy.crm.manager.utils.CompanySearchUtils;
import com.zy.crm.system.entity.Dept;
import com.zy.crm.system.entity.Dic;
import com.zy.crm.system.entity.Role;
@@ -56,6 +59,8 @@
private DicService dicService;
@Autowired
private DeptService deptService;
+ @Autowired
+ private OrderService orderService;
@RequestMapping(value = "/cstmr/{id}/auth")
@ManagerAuth
@@ -76,9 +81,9 @@
if (!Cools.isEmpty(followerName)){
User username = userService.selectOne(new EntityWrapper<User>().eq("username", followerName));
if (!Cools.isEmpty(username)){
- List<Integer> cstmrIds = cstmrFollService.selectCstmrIdUserId(username.getId().intValue());
- for (Integer id : cstmrIds){
- ids.add(id);
+ List<CstmrFoll> cstmrIds = cstmrFollService.selectCstmrIdUserId(username.getId().intValue());
+ for (CstmrFoll id : cstmrIds){
+ ids.add(id.getCstmrId().intValue());
}
}else {
return R.error("鏈煡璇㈠埌璺熻繘浜轰俊鎭紒");
@@ -108,11 +113,18 @@
}
@RequestMapping(value = "/cstmr/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "娣诲姞鐢叉柟鍗曚綅")
public R add(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)); // 瀹㈡埛浠ｅ彿
@@ -129,7 +141,7 @@
}
@RequestMapping(value = "/cstmr/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊鐢叉柟鍗曚綅")
public R update(Cstmr cstmr){
if (Cools.isEmpty(cstmr) || null==cstmr.getId()){
return R.error();
@@ -141,14 +153,28 @@
}
@RequestMapping(value = "/cstmr/delete/auth")
- @ManagerAuth
+ @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));
+ if (order!=0){
+ return R.error("瀛樺湪鍏宠仈鐨勮窡韪」鐩紝绂佹鍒犻櫎锛侊紒锛�");
+ }
cstmrService.deleteById(id);
}
return R.ok();
}
+ @RequestMapping(value = "/cstmr/delete/one/{id}")
+ @ManagerAuth(memo = "鍒犻櫎鐢叉柟鍗曚綅")
+ public R deleteOne(@PathVariable Long id) {
+ int cstmr_id = orderService.selectCount(new EntityWrapper<Order>().eq("cstmr_id", id));
+ if (cstmr_id!=0){
+ return R.error("瀛樺湪鍏宠仈璺熻釜椤圭洰锛岀姝㈠垹闄わ紒锛侊紒");
+ }
+ cstmrService.deleteById(id);
+ return R.ok();
+ }
@RequestMapping(value = "/cstmrQuery/auth")
@@ -167,6 +193,13 @@
return R.ok(result);
}
+ @RequestMapping(value = "/cstmrSearch/auth")
+ @ManagerAuth
+ public R cstmrSearch(String condition) {
+ List<Map<String, Object>> search = CompanySearchUtils.search(condition, 1);
+ return R.ok(search);
+ }
+
@RequestMapping(value = "/cstmr/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
--
Gitblit v1.9.1