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,6 +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());
         sysUser.setSysUser(sysUserVO);
         Set<String> rolePermission = permissionService.getRolePermission(userInfo.getUserId());
         sysUser.setRoles(rolePermission);

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

@@ -179,4 +179,10 @@ public interface SysUserMapper extends CrudMapper<SysUser> {
     public void insertMbUser(@Param("userId") Long userId,@Param("cids") String cids,@Param("createBy") String createBy);
 
     public void updateMbUser(@Param("phone") String phone,@Param("openId") String openId,@Param("userId") Long userId,@Param("cids") String cids,@Param("updateBy") String updateBy);
+
+    SysUser selectUserTenantData(@Param("userName") String userName,
+                                 @Param("tenantId") Integer tenantId);
+
+    SysUser selectUserTenantDataOne(@Param("tenantId") Integer tenantId,
+                                    @Param("phone") String phone);
 }

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

@@ -1,5 +1,6 @@
 package com.usky.system.mapper;
 
+import com.usky.system.domain.SysUser;
 import com.usky.system.domain.SysUserTenant;
 import com.usky.common.mybatis.core.CrudMapper;
 import org.apache.ibatis.annotations.Param;

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

@@ -589,12 +589,12 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
     public SysUser getAppUserInfo(String username, Integer tenantId, String phone) {
         SysUser sysUser = new SysUser();
         if (!StringUtils.isBlank(username)) {
-            sysUser = userMapper.selectUserData(username, tenantId);
+            sysUser = userMapper.selectUserTenantData(username, tenantId);
         } else if (!StringUtils.isBlank(phone)) {
-            sysUser = userMapper.selectUserDataOne(tenantId, phone);
+            sysUser = userMapper.selectUserTenantDataOne(tenantId, phone);
         }
         if (Objects.isNull(sysUser)) {
-            sysUser = userMapper.selectUserDataOne(tenantId, username);
+            sysUser = userMapper.selectUserTenantDataOne(tenantId, username);
             if (Objects.isNull(sysUser)) {
                 throw new BusinessException("用户信息未注册");
             }

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

@@ -366,4 +366,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</set>
 		where user_id = #{userId}
 	</update>
+
+	<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};
+    </select>
+
+	<select id="selectUserTenantDataOne" 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.phonenumber = #{phone};
+    </select>
 </mapper>