From fc72c9174c705d3b2d7e40e687c04e348bfe098f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 24 八月 2023 10:53:08 +0800
Subject: [PATCH] LIMS管理系统框架-开发8-24组织架构后端完成
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java
index 77c0d32..3b5fffe 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java
@@ -6,10 +6,12 @@
import com.yuanchu.limslaboratory.service.EnterpriseService;
import com.yuanchu.limslaboratory.service.OrganizationalService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -32,14 +34,16 @@
private EnterpriseService enterpriseService;
@Override
- public Map<String, Object> OrganizationalTree() {
+ public List<Map<String, Object>> OrganizationalTree() {
String firstEnterpriseName = enterpriseService.getFirstEnterpriseName();
List<Map<String, Object>> mapList = organizationalMapper.OrganizationalTree(0);
Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> mapData = new ArrayList<>();
+ map.put("children", mapList);
map.put("id", 0);
map.put("department", firstEnterpriseName);
- map.put("children", mapList);
- return map;
+ mapData.add(map);
+ return mapData;
}
@Override
@@ -61,4 +65,9 @@
updateWrapper.set(Organizational::getState, 0);
return organizationalMapper.update(new Organizational(), updateWrapper);
}
+
+ @Override
+ public List<Map<String, Object>> getDepartmentListTable(Integer departmentId) {
+ return organizationalMapper.getDepartmentListTable(departmentId);
+ }
}
--
Gitblit v1.9.3