bug
luoyisheng
2025-03-27 fe9a623b42b02e7fcd112f6a85d55b3beeb58d2e
bug
2个文件已修改
8 ■■■■■ 已修改文件
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java
@@ -3,6 +3,7 @@
import com.sinata.common.core.domain.R;
import com.sinata.common.core.domain.entity.SysUser;
import com.sinata.common.utils.SecurityUtils;
import com.sinata.common.utils.StringUtils;
import com.sinata.system.domain.*;
import com.sinata.system.domain.dto.CheckOutDto;
import com.sinata.system.domain.dto.CollectTotalUpDto;
@@ -94,8 +95,9 @@
    @ApiOperation("获取医院监管列表")
    @PostMapping("/hospita/list")
    public R<List<SysDepartment>> list(String name, Long areaId) {
        SysDepartment byId = sysDepartmentService.getMyDepartment();
        List<SysDepartment> list = sysDepartmentService.lambdaQuery().likeRight(SysDepartment::getTreeCode, byId.getTreeCode()).like(name != null, SysDepartment::getDepartmentName, name).eq(SysDepartment::getOrgType, 2).list();
//        SysDepartment byId = sysDepartmentService.getMyDepartment();
        SysDepartment byId = sysDepartmentService.getById(areaId);
        List<SysDepartment> list = sysDepartmentService.lambdaQuery().likeRight(SysDepartment::getTreeCode, byId.getTreeCode()).like(StringUtils.isNotEmpty(name), SysDepartment::getDepartmentName, name).eq(SysDepartment::getOrgType, 2).list();
        for (SysDepartment sysDepartment : list) {
            //获取医院暂存间信息
            MwStagingRoom one = roomService.lambdaQuery().eq(MwStagingRoom::getDepartmentId, sysDepartment.getId()).one();
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
@@ -227,7 +227,7 @@
            SysDepartment byId = this.getById(sysDepartmentVO.getParentId());
            childrenMap = getChildrenDepartmentMap(byId);
            sysDepartmentVO = fillChildrenTreeModel(byId, childrenMap);
            sysDepartmentVO.setChildren(new ArrayList<>());
//            sysDepartmentVO.setChildren(new ArrayList<>());
        }
        if (sysDepartmentVO.getTreeCode().length()==10){
            SysDepartment sysDepartment = this.baseMapper.selectById(sysDepartmentVO.getParentId());