From 5c0bc75816a7b5fa348d658897a304f588d9d0ed Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 20 十一月 2025 14:50:47 +0800
Subject: [PATCH] yys 1.劳保修改

---
 src/main/java/com/ruoyi/lavorissue/service/impl/DeptPositionServiceImpl.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/lavorissue/service/impl/DeptPositionServiceImpl.java b/src/main/java/com/ruoyi/lavorissue/service/impl/DeptPositionServiceImpl.java
index 49441b6..44a4498 100644
--- a/src/main/java/com/ruoyi/lavorissue/service/impl/DeptPositionServiceImpl.java
+++ b/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. 閫掑綊鑾峰彇褰撳墠閮ㄩ棬鍙婃墍鏈夊瓙閮ㄩ棬鐨処D闆嗗悎
@@ -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()));
     }
 
     /**

--
Gitblit v1.9.3