From f40a9f9c1b90d3efd52926b29f3612cb1c293afa Mon Sep 17 00:00:00 2001 From: LSH Date: 星期一, 11 九月 2023 13:25:42 +0800 Subject: [PATCH] #跟踪项目负责人默认值 --- src/main/java/com/zy/crm/manager/controller/CstmrController.java | 36 +++++++++++++++++++++++++++++++++--- 1 files changed, 33 insertions(+), 3 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 3a0a600..75ffe4d 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 @@ -108,11 +113,15 @@ } @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("瀹㈡埛宸插瓨鍦�"); + } + Cstmr cstmr1 = cstmrService.selectByName(hostId, cstmr.getName()); + if (cstmr1!=null){ + throw new CoolException("璇ュ鎴蜂俊鎭凡瀛樺湪锛屼笟鍔″憳鏄�:"+cstmr1.getDirector$()); } cstmr.setHostId(hostId); cstmr.setUuid(cstmrService.getUuid(hostId)); // 瀹㈡埛浠e彿 @@ -129,7 +138,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 +150,28 @@ } @RequestMapping(value = "/cstmr/delete/auth") - @ManagerAuth + @ManagerAuth(memo = "鍒犻櫎鐢叉柟鍗曚綅") public R delete(@RequestParam(value="ids[]") Long[] ids){ for (Long id : ids){ + 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 = "/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 +190,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