From 4c57c2a04408fb8f9c0c08cf8d1919c76a90658c Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期一, 11 四月 2022 11:50:16 +0800 Subject: [PATCH] update springboot-admin 2.6.5 => 2.6.6 update qiniu 7.9.3 => 7.9.5 update qcloud 5.6.68 => 5.6.72 update minio 8.3.7 => 8.3.8 update okhttp 4.9.2 => 4.9.3 --- ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index d6e8d9d..9ecd86e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -1,6 +1,6 @@ package com.ruoyi.system.service; -import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; @@ -11,10 +11,10 @@ * * @author Lion Li */ -public interface ISysUserService extends IService<SysUser> { +public interface ISysUserService { - TableDataInfo<SysUser> selectPageUserList(SysUser user); + TableDataInfo<SysUser> selectPageUserList(SysUser user, PageQuery pageQuery); /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃 @@ -30,7 +30,7 @@ * @param user 鐢ㄦ埛淇℃伅 * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅 */ - TableDataInfo<SysUser> selectAllocatedList(SysUser user); + TableDataInfo<SysUser> selectAllocatedList(SysUser user, PageQuery pageQuery); /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛� @@ -38,7 +38,7 @@ * @param user 鐢ㄦ埛淇℃伅 * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅 */ - TableDataInfo<SysUser> selectUnallocatedList(SysUser user); + TableDataInfo<SysUser> selectUnallocatedList(SysUser user, PageQuery pageQuery); /** * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴� @@ -47,6 +47,14 @@ * @return 鐢ㄦ埛瀵硅薄淇℃伅 */ SysUser selectUserByUserName(String userName); + + /** + * 閫氳繃鎵嬫満鍙锋煡璇㈢敤鎴� + * + * @param phonenumber 鎵嬫満鍙� + * @return 鐢ㄦ埛瀵硅薄淇℃伅 + */ + SysUser selectUserByPhonenumber(String phonenumber); /** * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛 @@ -200,13 +208,4 @@ */ int deleteUserByIds(Long[] userIds); - /** - * 瀵煎叆鐢ㄦ埛鏁版嵁 - * - * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃 - * @param isUpdateSupport 鏄惁鏇存柊鏀寔锛屽鏋滃凡瀛樺湪锛屽垯杩涜鏇存柊鏁版嵁 - * @param operName 鎿嶄綔鐢ㄦ埛 - * @return 缁撴灉 - */ - String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName); } -- Gitblit v1.9.3