From 28e148e28986a08414a4c690a5e5e7ecdc87f9a7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 21 八月 2025 18:56:06 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/DeptController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/DeptController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/DeptController.java
index 1985ad5..a2b4df1 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/DeptController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/DeptController.java
@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.system.controller.system;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
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;
@@ -8,6 +9,7 @@
import com.stylefeng.guns.core.exception.GunsException;
import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.node.ZTreeNode;
+import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.Dept;
import com.stylefeng.guns.modular.system.service.IDeptService;
@@ -37,6 +39,8 @@
@Autowired
private IDeptService deptService;
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
/**
@@ -73,7 +77,8 @@
@RequestMapping(value = "/tree")
@ResponseBody
public List<ZTreeNode> tree() {
- List<ZTreeNode> tree = this.deptService.tree();
+ ShiroUser user1 = shiroExtUtil.getUser();
+ List<ZTreeNode> tree = this.deptService.tree(user1.getObjectId());
tree.add(ZTreeNode.createParent());
return tree;
}
@@ -85,12 +90,13 @@
@RequestMapping(value = "/add")
@ResponseBody
public Object add(Dept dept) {
+ ShiroUser user1 = shiroExtUtil.getUser();
if (ToolUtil.isOneEmpty(dept, dept.getSimplename())) {
throw new GunsException(BizExceptionEnum.REQUEST_NULL);
}
//完善pids,根据pid拿到pid的pids
deptSetPids(dept);
-
+ dept.setObjectId(user1.getObjectId());
return this.deptService.insert(dept);
}
@@ -101,7 +107,8 @@
@RequestMapping(value = "/list")
@ResponseBody
public Object list(String condition) {
- List<Map<String, Object>> list = this.deptService.list(condition);
+ ShiroUser user1 = shiroExtUtil.getUser();
+ List<Map<String, Object>> list = this.deptService.list(condition, user1.getObjectId());
return super.warpObject(new DeptWarpper(list));
}
--
Gitblit v1.7.1