Merge branch 'JCB-KF' of uskycloud/usky-cloud into master

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TokenController.java

@@ -44,7 +44,7 @@ public class TokenController
     public ApiResult<?> login(@RequestBody LoginBody form)
     {
         // 用户登录
-        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
+        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword(), form.getTenantId());
         // 获取登录token
         return ApiResult.success(tokenService.createToken(userInfo));
     }
@@ -53,7 +53,7 @@ public class TokenController
     public ApiResult<?> login1(@RequestBody LoginBody form)
     {
         // 用户登录
-        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
+        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword(), form.getTenantId());
         // 获取登录token
         return ApiResult.success(tokenService.createToken(userInfo));
     }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserMapper.java

@@ -50,6 +50,8 @@ public interface SysUserMapper extends CrudMapper<SysUser>
      */
     public SysUser selectUserByUserName(String userName);
 
+    public SysUser selectUserByUserNameOne(String userName,Integer tenantId);
+
     /**
      * 通过用户ID查询用户
      * 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/ISysUserService.java

@@ -45,6 +45,8 @@ public interface ISysUserService extends CrudService<SysUser> {
      */
     public SysUser selectUserByUserName(String userName);
 
+    public SysUser selectUserByUserNameOne(String userName,Integer tenantId);
+
     /**
      * 通过用户ID查询用户
      *
@@ -196,6 +198,8 @@ public interface ISysUserService extends CrudService<SysUser> {
 
     public LoginUser getUserInfo(String username);
 
+    public LoginUser getUserInfoOne(String username,Integer tenantId);
+
 
     public Boolean register(SysUser sysUser);
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/SysLoginService.java

@@ -35,7 +35,7 @@ public class SysLoginService
     /**
      * 登录
      */
-    public LoginUser login(String username, String password)
+    public LoginUser login(String username, String password,Integer tenantId)
     {
         // 用户名或密码为空 错误
         if (StringUtils.isAnyBlank(username, password))
@@ -59,7 +59,13 @@ public class SysLoginService
         }
 
         // 查询用户信息
-        LoginUser loginUser = sysUserService.getUserInfo(username);
+        LoginUser loginUser = new LoginUser();
+        if (tenantId!=null&&tenantId!=0){
+            loginUser = sysUserService.getUserInfoOne(username,tenantId);
+        }else {
+            loginUser = sysUserService.getUserInfo(username);
+        }
+
         SysUserVO user = loginUser.getSysUser();
         if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
         {

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -103,6 +103,11 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         return userMapper.selectUserByUserName(userName);
     }
 
+    @Override
+    public SysUser selectUserByUserNameOne(String userName,Integer tenantId) {
+        return userMapper.selectUserByUserNameOne(userName,tenantId);
+    }
+
     /**
      * 通过用户ID查询用户
      *
@@ -464,6 +469,26 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         return SysUser;
     }
 
+    @Override
+    public LoginUser getUserInfoOne(String username,Integer tenantId)
+    {
+        SysUser sysUser = this.selectUserByUserNameOne(username,tenantId);
+        if (Objects.isNull(sysUser))
+        {
+            throw new BusinessException("用户信息/密码不存在");
+        }
+        // 角色集合
+        Set<String> roles = sysPermissionService.getRolePermission(sysUser);
+        // 权限集合
+        Set<String> permissions = sysPermissionService.getMenuPermission(sysUser);
+        LoginUser SysUser = new LoginUser();
+        SysUserVO sysUserVO = BeanMapperUtils.map(sysUser, SysUserVO.class);
+        SysUser.setSysUser(sysUserVO);
+        SysUser.setRoles(roles);
+        SysUser.setPermissions(permissions);
+        return SysUser;
+    }
+
     @Override
     public Boolean register(SysUser sysUser)
     {

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/LoginBody.java

@@ -17,6 +17,11 @@ public class LoginBody
      */
     private String password;
 
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+    
     public String getUsername()
     {
         return username;
@@ -36,4 +41,14 @@ public class LoginBody
     {
         this.password = password;
     }
+
+    public Integer getTenantId()
+    {
+        return tenantId;
+    }
+
+    public void setTenantId(Integer tenantId)
+    {
+        this.tenantId = tenantId;
+    }
 }

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysUserMapper.xml

@@ -135,6 +135,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    <include refid="selectUserVo"/>
 		where u.user_name = #{userName}
 	</select>
+
+	<select id="selectUserByUserNameOne" resultMap="SysUserResult">
+		<include refid="selectUserVo"/>
+		where u.user_name = #{userName} and u.tenant_id = #{tenantId}
+	</select>
 	
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>