From aa1e06a5cf1026af055e731586dcaf48c3e92b57 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 23 八月 2023 18:00:46 +0800
Subject: [PATCH] LIMS管理系统框架-开发8-23下班
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java | 10 +++++++---
1 files changed, 7 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..6ae1567 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
--
Gitblit v1.9.3