Merge branch 'han' of uskycloud/usky-cloud into system-165

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

@@ -79,7 +79,7 @@ public class TokenController {
         SysUser userInfo = sysLoginService.appLogin(form.getUsername(), form.getPassword(), form.getTenantId(), form.getPhone(), form.getVerify());
         LoginUser sysUser = new LoginUser();
         SysUserVO sysUserVO = BeanMapperUtils.map(userInfo, SysUserVO.class);
-        sysUserVO.setTenantId(form.getTenantId());
+        sysUserVO.setTenantId(userInfo.getTenantId());
         sysUser.setSysUser(sysUserVO);
         Set<String> rolePermission = permissionService.getRolePermission(userInfo.getUserId());
         sysUser.setRoles(rolePermission);

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

@@ -370,8 +370,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectUserTenantData" resultMap="SysUserResult">
         SELECT u.* FROM sys_user_tenant ut
         JOIN sys_user u ON ut.user_id = u.user_id
-        WHERE ut.tenant_id = #{tenantId} AND
-        u.user_name = #{userName}
+        WHERE u.user_name = #{userName}
     </select>
 
 	<select id="selectUserTenantDataOne" resultMap="SysUserResult">