From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/course/mapper/DeptMapper.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/DeptMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/DeptMapper.java
index eb65024..d969d44 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/DeptMapper.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/DeptMapper.java
@@ -22,11 +22,13 @@
/**
* 获取ztree的节点列表
*/
- List<ZTreeNode> tree();
+ List<ZTreeNode> tree(@Param("type") Integer type, @Param("id") Integer id);
+
+ List<Map<String, Object>> list(@Param("condition") String condition, @Param("objectType") Integer objectType, @Param("objectId") Integer objectId);
/**
* 获取所有部门列表
*/
- List<Map<String, Object>> list(@Param("condition") String condition);
+// List<Map<String, Object>> list(@Param("condition") String condition);
}
\ No newline at end of file
--
Gitblit v1.7.1