Merge branch 'master' of http://49.233.37.222:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -107,7 +107,7 @@ public class SysUserController extends BaseController
         userService.checkUserDataScope(userId);
         AjaxResult ajax = AjaxResult.success();
         List<SysRole> roles = roleService.selectRoleAll();
-        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin() && r.getTenantId() == getTenantId()).collect(Collectors.toList()));
         ajax.put("posts", postService.selectPostAll());
         if (StringUtils.isNotNull(userId))
         {
@@ -229,7 +229,7 @@ public class SysUserController extends BaseController
         SysUser user = userService.selectUserById(userId);
         List<SysRole> roles = roleService.selectRolesByUserId(userId);
         ajax.put("user", user);
-        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin() && r.getTenantId() == getTenantId()).collect(Collectors.toList()));
         return ajax;
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java

@@ -108,8 +108,10 @@ public class SysTenantServiceImpl implements ISysTenantService
     {
         //查询删除用户信息编号
         Long[] userIds = sysUserMapper.selectUserIdByTenantIds(tenantIds);
-        //删除用户
-        userService.deleteUserByIds(userIds);
+        if(userIds.length > 0) {
+            //删除用户
+            userService.deleteUserByIds(userIds);
+        }
         //删除租户
         return sysTenantMapper.deleteSysTenantByTenantIds(tenantIds);
     }

ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<sql id="selectRoleVo">
 	    select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
-            r.status, r.del_flag, r.create_time, r.remark ,t.tenant_name
+            r.status, r.del_flag, r.create_time, r.remark ,t.tenant_id,t.tenant_name
 		from sys_role r
 	        left join sys_user_role ur on ur.role_id = r.role_id
 	        left join sys_user u on u.user_id = ur.user_id

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -121,7 +121,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		d.dept_name,
 		d.leader,
 		u.tenant_id,
-		t.tenant_name
+		t.tenant_name,
+		u.user_type
 		FROM
 		sys_user u
 		LEFT JOIN sys_dept d ON u.dept_id = d.dept_id