From feb826a9165076a6658917015c63b804f9f219b7 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Mon, 26 Jun 2023 15:34:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/requirementtype/RequirementTypeList.vue  |  4 ++--
 .../controller/RequirementTypeController.java      | 14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/requirementtype/RequirementTypeList.vue b/ant-design-vue-jeecg/src/views/requirementtype/RequirementTypeList.vue
index 2577ae6..a4b316c 100644
--- a/ant-design-vue-jeecg/src/views/requirementtype/RequirementTypeList.vue
+++ b/ant-design-vue-jeecg/src/views/requirementtype/RequirementTypeList.vue
@@ -30,10 +30,10 @@
       <!-- 高级查询区域 -->
       <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
       <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
+<!--        <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
       </a-dropdown>
     </div>
 
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementtype/controller/RequirementTypeController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementtype/controller/RequirementTypeController.java
index e4b755f..e4e65594 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementtype/controller/RequirementTypeController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementtype/controller/RequirementTypeController.java
@@ -109,9 +109,17 @@ public class RequirementTypeController extends JeecgController<RequirementType,
 	@AutoLog(value = "需求类型-通过id删除")
 	@ApiOperation(value="需求类型-通过id删除", notes="需求类型-通过id删除")
 	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		requirementTypeService.removeById(id);
-		return Result.OK("删除成功!");
+	public Result<?> delete(@RequestParam(name="id",required=true) String id,HttpServletRequest req) {
+		RequirementType requirementType = new RequirementType();
+		QueryWrapper<RequirementType> queryWrapper = QueryGenerator.initQueryWrapper(requirementType, req.getParameterMap());
+		queryWrapper.eq("upper_id",id);
+		List<RequirementType> list = requirementTypeService.list(queryWrapper);
+		if(list.size()>0){
+			return Result.error("包含有下级需求类型，无法删除");
+		}else{
+			requirementTypeService.removeById(id);
+			return Result.OK("删除成功!");
+		}
 	}
 
 	/**