From 2f21f293c199ae596efeff080c76dc0f285e8faa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 04 十一月 2021 10:32:18 +0800
Subject: [PATCH] update 基于 hutool 封装树构建工具 重构部门与菜单树结构返回

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java |   63 +++++++++++++++++--------------
 1 files changed, 35 insertions(+), 28 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 99a7442..d6e8d9d 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
@@ -9,7 +9,7 @@
 /**
  * 鐢ㄦ埛 涓氬姟灞�
  *
- * @author ruoyi
+ * @author Lion Li
  */
 public interface ISysUserService extends IService<SysUser> {
 
@@ -22,7 +22,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
      */
-    public List<SysUser> selectUserList(SysUser user);
+    List<SysUser> selectUserList(SysUser user);
 
     /**
      * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
@@ -30,7 +30,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
      */
-    public TableDataInfo<SysUser> selectAllocatedList(SysUser user);
+    TableDataInfo<SysUser> selectAllocatedList(SysUser user);
 
     /**
      * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�
@@ -38,7 +38,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
      */
-    public TableDataInfo<SysUser> selectUnallocatedList(SysUser user);
+    TableDataInfo<SysUser> selectUnallocatedList(SysUser user);
 
     /**
      * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴�
@@ -46,7 +46,7 @@
      * @param userName 鐢ㄦ埛鍚�
      * @return 鐢ㄦ埛瀵硅薄淇℃伅
      */
-    public SysUser selectUserByUserName(String userName);
+    SysUser selectUserByUserName(String userName);
 
     /**
      * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
@@ -54,7 +54,7 @@
      * @param userId 鐢ㄦ埛ID
      * @return 鐢ㄦ埛瀵硅薄淇℃伅
      */
-    public SysUser selectUserById(Long userId);
+    SysUser selectUserById(Long userId);
 
     /**
      * 鏍规嵁鐢ㄦ埛ID鏌ヨ鐢ㄦ埛鎵�灞炶鑹茬粍
@@ -62,7 +62,7 @@
      * @param userName 鐢ㄦ埛鍚�
      * @return 缁撴灉
      */
-    public String selectUserRoleGroup(String userName);
+    String selectUserRoleGroup(String userName);
 
     /**
      * 鏍规嵁鐢ㄦ埛ID鏌ヨ鐢ㄦ埛鎵�灞炲矖浣嶇粍
@@ -70,7 +70,7 @@
      * @param userName 鐢ㄦ埛鍚�
      * @return 缁撴灉
      */
-    public String selectUserPostGroup(String userName);
+    String selectUserPostGroup(String userName);
 
     /**
      * 鏍¢獙鐢ㄦ埛鍚嶇О鏄惁鍞竴
@@ -78,7 +78,7 @@
      * @param userName 鐢ㄦ埛鍚嶇О
      * @return 缁撴灉
      */
-    public String checkUserNameUnique(String userName);
+    String checkUserNameUnique(String userName);
 
     /**
      * 鏍¢獙鎵嬫満鍙风爜鏄惁鍞竴
@@ -86,7 +86,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 缁撴灉
      */
-    public String checkPhoneUnique(SysUser user);
+    String checkPhoneUnique(SysUser user);
 
     /**
      * 鏍¢獙email鏄惁鍞竴
@@ -94,14 +94,21 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 缁撴灉
      */
-    public String checkEmailUnique(SysUser user);
+    String checkEmailUnique(SysUser user);
 
     /**
      * 鏍¢獙鐢ㄦ埛鏄惁鍏佽鎿嶄綔
      *
      * @param user 鐢ㄦ埛淇℃伅
      */
-    public void checkUserAllowed(SysUser user);
+    void checkUserAllowed(SysUser user);
+
+    /**
+     * 鏍¢獙鐢ㄦ埛鏄惁鏈夋暟鎹潈闄�
+     *
+     * @param userId 鐢ㄦ埛id
+     */
+    void checkUserDataScope(Long userId);
 
     /**
      * 鏂板鐢ㄦ埛淇℃伅
@@ -109,7 +116,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 缁撴灉
      */
-    public int insertUser(SysUser user);
+    int insertUser(SysUser user);
 
     /**
      * 娉ㄥ唽鐢ㄦ埛淇℃伅
@@ -117,7 +124,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 缁撴灉
      */
-    public boolean registerUser(SysUser user);
+    boolean registerUser(SysUser user);
 
     /**
      * 淇敼鐢ㄦ埛淇℃伅
@@ -125,15 +132,15 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 缁撴灉
      */
-    public int updateUser(SysUser user);
+    int updateUser(SysUser user);
 
     /**
      * 鐢ㄦ埛鎺堟潈瑙掕壊
      *
-     * @param userId 鐢ㄦ埛ID
+     * @param userId  鐢ㄦ埛ID
      * @param roleIds 瑙掕壊缁�
      */
-    public void insertUserAuth(Long userId, Long[] roleIds);
+    void insertUserAuth(Long userId, Long[] roleIds);
 
     /**
      * 淇敼鐢ㄦ埛鐘舵��
@@ -141,7 +148,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 缁撴灉
      */
-    public int updateUserStatus(SysUser user);
+    int updateUserStatus(SysUser user);
 
     /**
      * 淇敼鐢ㄦ埛鍩烘湰淇℃伅
@@ -149,16 +156,16 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 缁撴灉
      */
-    public int updateUserProfile(SysUser user);
+    int updateUserProfile(SysUser user);
 
     /**
      * 淇敼鐢ㄦ埛澶村儚
      *
      * @param userName 鐢ㄦ埛鍚�
-     * @param avatar 澶村儚鍦板潃
+     * @param avatar   澶村儚鍦板潃
      * @return 缁撴灉
      */
-    public boolean updateUserAvatar(String userName, String avatar);
+    boolean updateUserAvatar(String userName, String avatar);
 
     /**
      * 閲嶇疆鐢ㄦ埛瀵嗙爜
@@ -166,7 +173,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 缁撴灉
      */
-    public int resetPwd(SysUser user);
+    int resetPwd(SysUser user);
 
     /**
      * 閲嶇疆鐢ㄦ埛瀵嗙爜
@@ -175,7 +182,7 @@
      * @param password 瀵嗙爜
      * @return 缁撴灉
      */
-    public int resetUserPwd(String userName, String password);
+    int resetUserPwd(String userName, String password);
 
     /**
      * 閫氳繃鐢ㄦ埛ID鍒犻櫎鐢ㄦ埛
@@ -183,7 +190,7 @@
      * @param userId 鐢ㄦ埛ID
      * @return 缁撴灉
      */
-    public int deleteUserById(Long userId);
+    int deleteUserById(Long userId);
 
     /**
      * 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅
@@ -191,15 +198,15 @@
      * @param userIds 闇�瑕佸垹闄ょ殑鐢ㄦ埛ID
      * @return 缁撴灉
      */
-    public int deleteUserByIds(Long[] userIds);
+    int deleteUserByIds(Long[] userIds);
 
     /**
      * 瀵煎叆鐢ㄦ埛鏁版嵁
      *
-     * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃
+     * @param userList        鐢ㄦ埛鏁版嵁鍒楄〃
      * @param isUpdateSupport 鏄惁鏇存柊鏀寔锛屽鏋滃凡瀛樺湪锛屽垯杩涜鏇存柊鏁版嵁
-     * @param operName 鎿嶄綔鐢ㄦ埛
+     * @param operName        鎿嶄綔鐢ㄦ埛
      * @return 缁撴灉
      */
-    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+    String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
 }

--
Gitblit v1.9.3