From 22ab478185c9f50e54ca30191bf3c847980e99e1 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 14 十月 2022 09:41:35 +0800
Subject: [PATCH] 修改提交判重bug 及个人中心排序bug
---
flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 46 insertions(+), 1 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 4ebc218..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
@@ -48,7 +53,6 @@
*/
@ApiOperation(value = " 获取管理菜单列表(已分级)",response = ClassifyAdministration.class)
@GetMapping("/getListByParentId")
- @Authorization
public TableDataInfo selectConfigListByParentId(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
@RequestParam(value = "parentId",required = false) String parentId,
@@ -59,6 +63,7 @@
Page<ClassifyAdministration> pageParam = new Page<>(pageNum,pageSize);
return getDataTable(iClassifyAdministrationService.selectRootList(pageParam,pageSize,parentId,departmentId),num);
}
+
/**
@@ -127,6 +132,46 @@
{
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));
}
+
+ /**
+ * 获取分类根据id 如果是二级id则获取的是办事指南
+ * @return
+ */
+ @ApiOperation("获取分类根据id 如果是二级id则获取的是办事指南,不传参默认是0")
+ @GetMapping("/queryListById")
+ ResultData queryListById(@RequestParam(value = "id",required = false) Integer id){
+ if(id==null)
+ id=0;
+ return iClassifyAdministrationService.queryListById(id);
+ }
+
+
+
+
+
+
+
+
+
+
}
--
Gitblit v1.7.1