From 7d1c53f92738166c1ced1a796e2bc95d26d35fa0 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 18 一月 2023 11:59:32 +0800 Subject: [PATCH] update 优化 修改 oss 配置页面开关说明 避免造成误解 --- ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java | 36 ++++++++++++++++-------------------- 1 files changed, 16 insertions(+), 20 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 a901e0a..8d5a326 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,9 +1,8 @@ package com.ruoyi.system.service; -import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.system.domain.SysUser; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.service.UserService; import java.util.List; @@ -12,10 +11,10 @@ * * @author Lion Li */ -public interface ISysUserService extends IService<SysUser>, UserService { +public interface ISysUserService { - TableDataInfo<SysUser> selectPageUserList(SysUser user); + TableDataInfo<SysUser> selectPageUserList(SysUser user, PageQuery pageQuery); /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃 @@ -31,7 +30,7 @@ * @param user 鐢ㄦ埛淇℃伅 * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅 */ - TableDataInfo<SysUser> selectAllocatedList(SysUser user); + TableDataInfo<SysUser> selectAllocatedList(SysUser user, PageQuery pageQuery); /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛� @@ -39,7 +38,7 @@ * @param user 鐢ㄦ埛淇℃伅 * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅 */ - TableDataInfo<SysUser> selectUnallocatedList(SysUser user); + TableDataInfo<SysUser> selectUnallocatedList(SysUser user, PageQuery pageQuery); /** * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴� @@ -47,8 +46,15 @@ * @param userName 鐢ㄦ埛鍚� * @return 鐢ㄦ埛瀵硅薄淇℃伅 */ - @Override SysUser selectUserByUserName(String userName); + + /** + * 閫氳繃鎵嬫満鍙锋煡璇㈢敤鎴� + * + * @param phonenumber 鎵嬫満鍙� + * @return 鐢ㄦ埛瀵硅薄淇℃伅 + */ + SysUser selectUserByPhonenumber(String phonenumber); /** * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛 @@ -56,7 +62,6 @@ * @param userId 鐢ㄦ埛ID * @return 鐢ㄦ埛瀵硅薄淇℃伅 */ - @Override SysUser selectUserById(Long userId); /** @@ -78,10 +83,10 @@ /** * 鏍¢獙鐢ㄦ埛鍚嶇О鏄惁鍞竴 * - * @param userName 鐢ㄦ埛鍚嶇О + * @param user 鐢ㄦ埛淇℃伅 * @return 缁撴灉 */ - String checkUserNameUnique(String userName); + String checkUserNameUnique(SysUser user); /** * 鏍¢獙鎵嬫満鍙风爜鏄惁鍞竴 @@ -203,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