From 6984757bfc75b4a25014de1eb71c2aa75ebdb86f Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期六, 26 八月 2023 15:59:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- standard-server/src/main/java/com/yuanchu/limslaboratory/service/OrganizationalService.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/OrganizationalService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/OrganizationalService.java index bfedae9..8854972 100644 --- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/OrganizationalService.java +++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/OrganizationalService.java @@ -16,11 +16,13 @@ */ public interface OrganizationalService extends IService<Organizational> { - Map<String, Object> OrganizationalTree(); + List<Map<String, Object>> OrganizationalTree(); Integer addDepartment(Organizational organizational); Integer updateDepartment(Integer id, Organizational organizational); - Integer deleteDepartment(Integer id); + void deleteDepartment(String ids); + + List<Map<String, Object>> getDepartmentListTable(Integer departmentId); } -- Gitblit v1.9.3