From 64423bf1176b525ce4a182ebb9e6ef6a355d3d74 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 10 九月 2023 20:40:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 12 ++++++++++++
src/main/webapp/static/js/cstmr/cstmr.js | 6 +++---
2 files changed, 15 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 b2d6320..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,11 @@
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;
@@ -57,6 +59,8 @@
private DicService dicService;
@Autowired
private DeptService deptService;
+ @Autowired
+ private OrderService orderService;
@RequestMapping(value = "/cstmr/{id}/auth")
@ManagerAuth
@@ -149,6 +153,10 @@
@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();
@@ -157,6 +165,10 @@
@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();
}
diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js
index bc5a4d4..abc13f8 100644
--- a/src/main/webapp/static/js/cstmr/cstmr.js
+++ b/src/main/webapp/static/js/cstmr/cstmr.js
@@ -138,10 +138,10 @@
// size: 'sm',
skin: 'line',
cols: [[
- {type: 'checkbox'}
+ // {type: 'checkbox'}
// ,{field: 'id', align: 'center',title: 'ID'}
- // ,{field: 'hostId$', align: 'center',title: '鎵�灞炲晢鎴�'}
- ,{field: 'name', align: 'left',title: '瀹㈡埛鍚嶇О', style: 'color: #1890ff;cursor:pointer', event: 'more', width: 350}
+ // ,{field: 'hostId$', align: 'center',title: '鎵�灞炲晢鎴�'},
+ {field: 'name', align: 'left',title: '瀹㈡埛鍚嶇О', style: 'color: #1890ff;cursor:pointer', event: 'more', width: 350}
,{field: 'simple', align: 'left',title: '瀹㈡埛绠�绉�', hide: true}
,{field: 'uuid', align: 'left',title: '瀹㈡埛浠ｅ彿'}
,{field: 'addr', align: 'left',title: '璇︾粏鍦板潃', templet:function(d){return emptyShow(d.addr)}}
--
Gitblit v1.9.1