修改bug

Fixiaobai

2023-09-08 d2ce4553e18131b9a60d7be53c496f0cbce699ca

 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
@@ -55,10 +59,12 @@
    }

    @Override
    public Integer deleteDepartment(Integer id) {
        LambdaUpdateWrapper<Organizational> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper.eq(Organizational::getId, id);
        updateWrapper.set(Organizational::getState, 0);
        return organizationalMapper.update(new Organizational(), updateWrapper);
    public void deleteDepartment(String ids) {
        organizationalMapper.deleteDepartment(ids);
    }

    @Override
    public List<Map<String, Object>> getDepartmentListTable(Integer departmentId) {
        return organizationalMapper.getDepartmentListTable(departmentId);
    }
}