LIMS管理系统框架-开发8-23下班

XiaoRuby

2023-08-23 aa1e06a5cf1026af055e731586dcaf48c3e92b57

LIMS管理系统框架-开发8-23下班

 standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java

@@ -34,7 +34,7 @@
    @ApiOperation(value = "侧边栏树展开")
    @GetMapping("/list")
    public Result<?> getFourLevelInformation() {
        Map<String, Object> organizationalTree = organizationalService.OrganizationalTree();
        List<Map<String, Object>> organizationalTree = organizationalService.OrganizationalTree();
        return Result.success(organizationalTree);
    }


 standard-server/src/main/java/com/yuanchu/limslaboratory/service/OrganizationalService.java

@@ -16,7 +16,7 @@
 */
public interface OrganizationalService extends IService<Organizational> {

    Map<String, Object> OrganizationalTree();
    List<Map<String, Object>> OrganizationalTree();

    Integer addDepartment(Organizational organizational);


 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