diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java index 7487aeb5..e63a1463 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java @@ -1,8 +1,8 @@ package org.dromara.bigscreen.controller; -import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.lang.tree.Tree; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import jakarta.annotation.Resource; @@ -41,6 +41,7 @@ import org.dromara.common.web.core.BaseController; import org.dromara.patch.domain.bo.PdMasterBo; import org.dromara.patch.domain.vo.PdMasterBymiAndQt; import org.dromara.patch.service.IPdMasterService; +import org.dromara.system.service.impl.SysDeptServiceImpl; import org.dromara.system.service.impl.SysUserServiceImpl; import org.dromara.warm.flow.core.FlowEngine; import org.dromara.warm.flow.core.entity.User; @@ -80,12 +81,6 @@ public class PersonalHomeController extends BaseController { private final IBusWjzxService busWjzxService; private final IBusSygjService busSygjService; - - - - - - @Autowired private IPdMasterService pdMasterService; @@ -96,6 +91,11 @@ public class PersonalHomeController extends BaseController { @Resource private IAIChatMemoryService aiChatMemoryService; + @Autowired + private SysDeptServiceImpl sysDeptService; + + + // region AI 模块 @@ -170,6 +170,11 @@ public class PersonalHomeController extends BaseController { + /** + * 首页待办事项 + * @param projectId + * @return + */ @GetMapping("/getTaskList") public R getTaskList(String projectId) { TaskInfoDto taskInfoDto = new TaskInfoDto(); @@ -290,4 +295,12 @@ public class PersonalHomeController extends BaseController { return busBwlService.queryPageList(bo, pageQuery); } + /** + * 获取部门树 + */ + @GetMapping("/deptTree") + public R>> deptTree() { + return R.ok(sysDeptService.buildDeptTree()); + } + }