From f490e99ab8a861cdf61890f1f6f39b65e9def253 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 14 十月 2022 14:16:40 +0800
Subject: [PATCH] 修改组织架构删除接口 小程序注册用户不能登录导办人员 修改用户查询接口 bug
---
flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java | 63 ++++++++++++++++++++++++-------
1 files changed, 49 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..588db94 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
@@ -5,8 +5,10 @@
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.db.gen.entity.ClassifyAdministration;
+import com.dg.core.db.gen.entity.OrganizationChartEntity;
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;
@@ -15,6 +17,7 @@
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
@@ -29,6 +32,10 @@
@Autowired(required = true)
IClassifyAdministrationService iClassifyAdministrationService;
+
+ @Autowired(required = true)
+ ITransactionEventService iTransactionEventService;
+
/**
* 获取管理菜单列表
* @return
@@ -59,19 +66,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 +134,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 +161,33 @@
*/
@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);
}
+
+
+
+ /**
+ * 树状分类选择列表
+ * @return
+ */
+ @ApiOperation("树状分类选择列表")
+ @GetMapping("/getClassifyList")
+ public TableDataInfo getClassifyList()
+ {
+ List<ClassifyAdministration> list=iClassifyAdministrationService.selectConfigList("","1");
+
+ for(ClassifyAdministration entity:list)
+ {
+ entity.setClassifyAdministrationEntityList(iClassifyAdministrationService.selectParentData(entity.getId()+""));
+ }
+ return getDataTable(list);
+ }
+
+
+
+
+
}
--
Gitblit v1.7.1