From 68e6e63670351165cc3c9aede5d7a1b5b7ba3fde Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 14 九月 2023 14:22:39 +0800
Subject: [PATCH] #CstmrId$
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java
index 67025b6..178b6ef 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -19,13 +19,8 @@
import com.zy.crm.common.utils.SetOfUtils;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.controller.result.FollowerTableVo;
-import com.zy.crm.manager.entity.Order;
-import com.zy.crm.manager.entity.Plan;
-import com.zy.crm.manager.entity.PlanFoll;
-import com.zy.crm.manager.entity.PlanType;
-import com.zy.crm.manager.service.PlanFollService;
-import com.zy.crm.manager.service.PlanService;
-import com.zy.crm.manager.service.PlanTypeService;
+import com.zy.crm.manager.entity.*;
+import com.zy.crm.manager.service.*;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.DeptService;
import com.zy.crm.system.service.UserService;
@@ -64,6 +59,8 @@
private DeptService deptService;
@Autowired
private OssService ossService;
+ @Autowired
+ private PriOnline2Service priOnline2Service;
@GetMapping(value = "/plan/{id}/auth")
@ManagerAuth
@@ -215,7 +212,11 @@
@ManagerAuth(memo = "鍒犻櫎瑙勫垝鐢宠鍗�")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
- planService.deleteById(id);
+ int priOnline2 = priOnline2Service.selectCount(new EntityWrapper<PriOnline2>().eq("item_id", id));
+ if (priOnline2!=0){
+ return R.error("瀛樺湪鍏宠仈鐨勬牳浠峰崟锛岀姝㈠垹闄わ紒锛侊紒");
+ }
+ planService.deleteById(id);
}
return R.ok();
}
@@ -575,7 +576,8 @@
for (Plan plan : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", plan.getId());
- map.put("value", plan.getName()+"---"+plan.getId());
+// map.put("value", plan.getName()+"---"+plan.getId());
+ map.put("value", plan.getName());
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1