From 23c4967b4cb8dbce8277f830f7152d315c5a4a57 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期一, 25 十二月 2023 09:25:17 +0800
Subject: [PATCH] 12.25
---
guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/SysDeptController.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/SysDeptController.java b/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/SysDeptController.java
index 83ba14a..733b570 100644
--- a/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/SysDeptController.java
+++ b/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/SysDeptController.java
@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.code.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.common.annotion.BussinessLog;
import com.stylefeng.guns.core.common.constant.dictmap.DeptDict;
import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
@@ -10,7 +11,9 @@
import com.stylefeng.guns.core.node.ZTreeNode;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.Dept;
+import com.stylefeng.guns.modular.system.model.User;
import com.stylefeng.guns.modular.system.service.IDeptService;
+import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.DeptWarpper;
import io.swagger.annotations.ApiOperation;
@@ -35,8 +38,8 @@
@GetMapping(value = "/list")
@ApiOperation(value = "列表", tags = {"后台-部门管理"})
@ResponseBody
- public Object list(String name) {
- List<Map<String, Object>> list = this.deptService.list(name);
+ public Object list(String fullname) {
+ List<Map<String, Object>> list = this.deptService.list(fullname);
return list;
}
@@ -50,6 +53,7 @@
throw new GunsException(BizExceptionEnum.REQUEST_NULL);
}
//完善pids,根据pid拿到pid的pids
+ dept.setPid(0);
deptSetPids(dept);
this.deptService.insert(dept);
return ResultUtil.success("添加成功");
@@ -59,19 +63,37 @@
@DataSource(name = "dataSourceBiz")
@GetMapping(value = "/tree")
- @ApiOperation(value = "获取部门树", tags = {"后台-部门管理"})
+ @ApiOperation(value = "获取部下拉框", tags = {"后台-部门管理"})
@ResponseBody
- public List<ZTreeNode> tree() {
+ public List<Dept> tree() {
List<ZTreeNode> tree = this.deptService.tree();
tree.add(ZTreeNode.createParent());
- return tree;
+
+ return deptService.selectList(null);
+// return tree;
+ }
+ @Autowired
+ private IUserService userService;
+ @DeleteMapping ("/delete")
+ @ResponseBody
+ @ApiOperation(value = "删除部门", tags = {"后台-部门管理"})
+ public ResultUtil delete(String ids) {
+ String[] split = ids.split(",");
+ for (String id : split) {
+ User user = userService.selectById(Integer.valueOf(id));
+ if (user!=null){
+ return ResultUtil.error("当前部门已绑定用户，无法删除");
+ }
+ deptService.deleteById(Integer.valueOf(id));
+
+ }
+ return ResultUtil.success("删除成功");
}
- @DataSource(name = "dataSourceBiz")
@GetMapping ("pre/edit/{deptId}")
public Dept deptUpdate(@PathVariable Integer deptId, Model model) {
Dept dept = deptService.selectById(deptId);
- return dept;
+ return dept;
}
@@ -84,6 +106,7 @@
if (ToolUtil.isEmpty(dept) || dept.getId() == null) {
throw new GunsException(BizExceptionEnum.REQUEST_NULL);
}
+ dept.setPid(0);
deptSetPids(dept);
Dept dept1 = deptService.selectById(dept.getId());
deptService.updateById(dept);
--
Gitblit v1.7.1