From e7242d40110c8a157867acd2d1a1718fb640d4c5 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期五, 17 二月 2023 16:02:04 +0800
Subject: [PATCH] fix 修正 SysTenantServiceImpl#deleteWithValidByIds 超管租户可以被删除的问题, 加上 id 校验 ; fix 修正 tenant/index.vue handleUpdate 租户套餐回显问题 ;

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java |   39 ++++++++++++++++++++-------------------
 1 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
index 8f393e6..b4b4489 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -2,7 +2,8 @@
 
 import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
-import com.ruoyi.system.domain.SysUser;
+import com.ruoyi.system.domain.bo.SysUserBo;
+import com.ruoyi.system.domain.vo.SysUserVo;
 
 import java.util.List;
 
@@ -14,7 +15,7 @@
 public interface ISysUserService {
 
 
-    TableDataInfo<SysUser> selectPageUserList(SysUser user, PageQuery pageQuery);
+    TableDataInfo<SysUserVo> selectPageUserList(SysUserBo user, PageQuery pageQuery);
 
     /**
      * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
@@ -22,7 +23,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
      */
-    List<SysUser> selectUserList(SysUser user);
+    List<SysUserVo> selectUserList(SysUserBo user);
 
     /**
      * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
@@ -30,7 +31,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
      */
-    TableDataInfo<SysUser> selectAllocatedList(SysUser user, PageQuery pageQuery);
+    TableDataInfo<SysUserVo> selectAllocatedList(SysUserBo user, PageQuery pageQuery);
 
     /**
      * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�
@@ -38,7 +39,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
      */
-    TableDataInfo<SysUser> selectUnallocatedList(SysUser user, PageQuery pageQuery);
+    TableDataInfo<SysUserVo> selectUnallocatedList(SysUserBo user, PageQuery pageQuery);
 
     /**
      * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴�
@@ -46,7 +47,7 @@
      * @param userName 鐢ㄦ埛鍚�
      * @return 鐢ㄦ埛瀵硅薄淇℃伅
      */
-    SysUser selectUserByUserName(String userName);
+    SysUserVo selectUserByUserName(String userName);
 
     /**
      * 閫氳繃鎵嬫満鍙锋煡璇㈢敤鎴�
@@ -54,7 +55,7 @@
      * @param phonenumber 鎵嬫満鍙�
      * @return 鐢ㄦ埛瀵硅薄淇℃伅
      */
-    SysUser selectUserByPhonenumber(String phonenumber);
+    SysUserVo selectUserByPhonenumber(String phonenumber);
 
     /**
      * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
@@ -62,7 +63,7 @@
      * @param userId 鐢ㄦ埛ID
      * @return 鐢ㄦ埛瀵硅薄淇℃伅
      */
-    SysUser selectUserById(Long userId);
+    SysUserVo selectUserById(Long userId);
 
     /**
      * 鏍规嵁鐢ㄦ埛ID鏌ヨ鐢ㄦ埛鎵�灞炶鑹茬粍
@@ -86,7 +87,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 缁撴灉
      */
-    String checkUserNameUnique(SysUser user);
+    String checkUserNameUnique(SysUserBo user);
 
     /**
      * 鏍￠獙鎵嬫満鍙风爜鏄惁鍞竴
@@ -94,7 +95,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 缁撴灉
      */
-    String checkPhoneUnique(SysUser user);
+    String checkPhoneUnique(SysUserBo user);
 
     /**
      * 鏍￠獙email鏄惁鍞竴
@@ -102,14 +103,14 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 缁撴灉
      */
-    String checkEmailUnique(SysUser user);
+    String checkEmailUnique(SysUserBo user);
 
     /**
      * 鏍￠獙鐢ㄦ埛鏄惁鍏佽鎿嶄綔
      *
      * @param user 鐢ㄦ埛淇℃伅
      */
-    void checkUserAllowed(SysUser user);
+    void checkUserAllowed(SysUserBo user);
 
     /**
      * 鏍￠獙鐢ㄦ埛鏄惁鏈夋暟鎹潈闄�
@@ -124,7 +125,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 缁撴灉
      */
-    int insertUser(SysUser user);
+    int insertUser(SysUserBo user);
 
     /**
      * 娉ㄥ唽鐢ㄦ埛淇℃伅
@@ -132,7 +133,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 缁撴灉
      */
-    boolean registerUser(SysUser user);
+    boolean registerUser(SysUserBo user, String tenantId);
 
     /**
      * 淇敼鐢ㄦ埛淇℃伅
@@ -140,7 +141,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 缁撴灉
      */
-    int updateUser(SysUser user);
+    int updateUser(SysUserBo user);
 
     /**
      * 鐢ㄦ埛鎺堟潈瑙掕壊
@@ -156,7 +157,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 缁撴灉
      */
-    int updateUserStatus(SysUser user);
+    int updateUserStatus(SysUserBo user);
 
     /**
      * 淇敼鐢ㄦ埛鍩烘湰淇℃伅
@@ -164,7 +165,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 缁撴灉
      */
-    int updateUserProfile(SysUser user);
+    int updateUserProfile(SysUserBo user);
 
     /**
      * 淇敼鐢ㄦ埛澶村儚
@@ -173,7 +174,7 @@
      * @param avatar   澶村儚鍦板潃
      * @return 缁撴灉
      */
-    boolean updateUserAvatar(String userName, String avatar);
+    boolean updateUserAvatar(String userName, Long avatar);
 
     /**
      * 閲嶇疆鐢ㄦ埛瀵嗙爜
@@ -181,7 +182,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 缁撴灉
      */
-    int resetPwd(SysUser user);
+    int resetPwd(SysUserBo user);
 
     /**
      * 閲嶇疆鐢ㄦ埛瀵嗙爜

--
Gitblit v1.9.3