From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/staff/SysStaffMapper.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/staff/SysStaffMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/staff/SysStaffMapper.java
index 2e7d82f..48b3999 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/staff/SysStaffMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/staff/SysStaffMapper.java
@@ -1,8 +1,13 @@
package com.ruoyi.system.mapper.staff;
-import com.ruoyi.system.domain.pojo.staff.SysStaff;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.system.domain.dto.MgtStaffPageDto;
+import com.ruoyi.system.api.domain.poji.sys.SysStaff;
+import com.ruoyi.system.domain.vo.DeptSimpleVo;
import com.ruoyi.system.domain.vo.MgtDeptStaffListVo;
+import com.ruoyi.system.domain.vo.MgtStaffPageVo;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -23,5 +28,43 @@
* @param
* @return List<MgtDeptStaffListVo>
*/
- List<MgtDeptStaffListVo> listMgtDeptStaff();
+ List<MgtDeptStaffListVo> listMgtDeptStaff(@Param("deptId") Long deptId,@Param("userId")Long userId, @Param("name")String name);
+
+ /**
+ * @description 获取部门员工列表
+ * @author jqs
+ * @date 2023/6/13 10:14
+ * @param
+ * @return List<MgtDeptStaffListVo>
+ */
+ List<MgtDeptStaffListVo> listMgtDeptStaffByDept(@Param("deptId") Long deptId,@Param("userId") Long userId);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/25 17:52
+ * @param page
+ * @param mgtStaffPageDto
+ * @return List<MgtStaffPageVo>
+ */
+ List<MgtStaffPageVo> pageMgtStaff(Page page, @Param("param")MgtStaffPageDto mgtStaffPageDto);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/8/27 17:46
+ * @param
+ * @return List<DeptSimpleVo>
+ */
+ List<DeptSimpleVo> listSimpleDept();
+
+
+ /**
+ * @description 通过id获取员工列表
+ * @author jqs
+ * @date 2023/9/5 10:02
+ * @param userIdList
+ * @return List<SysStaff>
+ */
+ List<SysStaff> listSysStaffByIds(@Param("userIdList")List<Long> userIdList);
}
--
Gitblit v1.7.1