yys 1.劳保修改

maven

2025-11-20 5c0bc75816a7b5fa348d658897a304f588d9d0ed

 src/main/java/com/ruoyi/lavorissue/service/impl/DeptPositionServiceImpl.java

@@ -1,6 +1,7 @@
package com.ruoyi.lavorissue.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -115,8 +116,9 @@
            throw new IllegalArgumentException("无效的部门或岗位ID");
        }
        if(dept.getType() == 2){
            return laborConfMapper.selectList(Wrappers.lambdaQuery(LaborConf.class)
                    .eq(LaborConf::getDeptPositionId, deptId));
            List<Long> ids = new ArrayList<>();
            ids.add(deptId);
            return laborConfMapper.list(ids);
        }

        // 2. 递归获取当前部门及所有子部门的ID集合
@@ -139,10 +141,9 @@
        if(CollectionUtils.isEmpty(deptPositions)){
            return Collections.emptyList();
        }
        return laborConfMapper.selectList(Wrappers.lambdaQuery(LaborConf.class)
                .in(LaborConf::getDeptPositionId, deptPositions.stream()
                        .map(DeptPosition::getId)
                        .collect(Collectors.toSet())));
        return laborConfMapper.list(deptPositions.stream()
                .map(DeptPosition::getId)
                .collect(Collectors.toList()));
    }

    /**