From 9318f182b0a226d1a55d5989e37f037d1b87c910 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期六, 17 八月 2024 10:10:51 +0800 Subject: [PATCH] reset 回滚 修改spring源码上下文持有者(存在数据未清理内存泄漏问题) --- ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java index 392aea0..0325a25 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java @@ -3,6 +3,7 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.system.domain.bo.SysUserBo; +import org.dromara.system.domain.vo.SysUserExportVo; import org.dromara.system.domain.vo.SysUserVo; import java.util.List; @@ -23,7 +24,7 @@ * @param user 鐢ㄦ埛淇℃伅 * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅 */ - List<SysUserVo> selectUserList(SysUserBo user); + List<SysUserExportVo> selectUserExportList(SysUserBo user); /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛� @@ -66,20 +67,29 @@ SysUserVo selectUserById(Long userId); /** + * 閫氳繃鐢ㄦ埛ID涓叉煡璇㈢敤鎴� + * + * @param userIds 鐢ㄦ埛ID涓� + * @param deptId 閮ㄩ棬id + * @return 鐢ㄦ埛鍒楄〃淇℃伅 + */ + List<SysUserVo> selectUserByIds(List<Long> userIds, Long deptId); + + /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ鐢ㄦ埛鎵�灞炶鑹茬粍 * - * @param userName 鐢ㄦ埛鍚� + * @param userId 鐢ㄦ埛ID * @return 缁撴灉 */ - String selectUserRoleGroup(String userName); + String selectUserRoleGroup(Long userId); /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ鐢ㄦ埛鎵�灞炲矖浣嶇粍 * - * @param userName 鐢ㄦ埛鍚� + * @param userId 鐢ㄦ埛ID * @return 缁撴灉 */ - String selectUserPostGroup(String userName); + String selectUserPostGroup(Long userId); /** * 鏍¢獙鐢ㄦ埛鍚嶇О鏄惁鍞竴 @@ -118,13 +128,6 @@ * @param userId 鐢ㄦ埛id */ void checkUserDataScope(Long userId); - - /** - * 鏍¢獙閮ㄩ棬鏄惁鏈夋暟鎹潈闄� - * - * @param deptId 閮ㄩ棬id - */ - void checkDeptDataScope(Long deptId); /** * 鏂板鐢ㄦ埛淇℃伅 @@ -212,8 +215,8 @@ /** * 閫氳繃閮ㄩ棬id鏌ヨ褰撳墠閮ㄩ棬鎵�鏈夌敤鎴� * - * @param deptId - * @return + * @param deptId 閮ㄩ棬id + * @return 缁撴灉 */ List<SysUserVo> selectUserListByDept(Long deptId); } -- Gitblit v1.9.3