From 3e0236dfc2cf6fca45c5e951a2cb0c722ba60b38 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 24 一月 2024 15:16:03 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 1.1
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/staff/SysStaffMapper.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 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 7bc4909..5dff21d 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,9 +1,10 @@
package com.ruoyi.system.mapper.staff;
+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.domain.pojo.staff.SysStaff;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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;
@@ -27,7 +28,7 @@
* @param
* @return List<MgtDeptStaffListVo>
*/
- List<MgtDeptStaffListVo> listMgtDeptStaff();
+ List<MgtDeptStaffListVo> listMgtDeptStaff(@Param("deptId") Long deptId,@Param("userId")Long userId);
/**
* @description 获取部门员工列表
@@ -47,4 +48,23 @@
* @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