From 3bfd069ac28bc270562afbfe95963193bec485cc Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 13 十月 2022 14:32:54 +0800
Subject: [PATCH] 修改删除分类需要判断旗下是否有二级分类及分类下是否关联有办事指南bug
---
flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java b/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java
index b8123f3..9348958 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java
@@ -7,6 +7,7 @@
import com.dg.core.db.gen.entity.ClassifyAdministration;
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.service.IClassifyAdministrationService;
+import com.dg.core.service.ITransactionEventService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -29,6 +30,10 @@
@Autowired(required = true)
IClassifyAdministrationService iClassifyAdministrationService;
+
+ @Autowired(required = true)
+ ITransactionEventService iTransactionEventService;
+
/**
* 获取管理菜单列表
* @return
@@ -59,19 +64,6 @@
return getDataTable(iClassifyAdministrationService.selectRootList(pageParam,pageSize,parentId,departmentId),num);
}
- /**
- * 获取管理菜单列表(无分页已分级)
- * @return
- */
- @ApiOperation(value = " 获取管理菜单列表(无分页已分级))",response = ClassifyAdministration.class)
- @GetMapping("/selectListByParentId")
- public TableDataInfo selectListByParentId(@RequestParam(value = "parentId",required = false) String parentId,
- @RequestParam(value = "departmentId",required = false) Integer departmentId){
- int num=iClassifyAdministrationService.countNum("",null);
- if (parentId==null)
- parentId="0";
- return getDataTable(iClassifyAdministrationService.selectConfigListByParentId(parentId, departmentId),num);
- }
/**
@@ -140,6 +132,24 @@
{
return ResultData.error("id 不能为空");
}
+
+ /**
+ * 根据上级id查询子分类
+ * @param parentId
+ * @return
+ */
+ List<String> list=iClassifyAdministrationService.selectParent(Id);
+ if(list!=null && list.size()>0)
+ {
+ return ResultData.error("请先删除其下的二级分类");
+ }
+
+ List<String> listIds=iTransactionEventService.selectclassifyId(Id);
+ if(listIds!=null && listIds.size()>0)
+ {
+ return ResultData.error("分类下有办事指南！不能删除");
+ }
+
return toAjax(iClassifyAdministrationService.deleteConfigById(Id));
}
@@ -149,10 +159,19 @@
*/
@ApiOperation("获取分类根据id 如果是二级id则获取的是办事指南,不传参默认是0")
@GetMapping("/queryListById")
- @Authorization
ResultData queryListById(@RequestParam(value = "id",required = false) Integer id){
if(id==null)
id=0;
return iClassifyAdministrationService.queryListById(id);
}
+
+
+
+
+
+
+
+
+
+
}
--
Gitblit v1.7.1