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/SysUserController.java

@@ -224,4 +224,15 @@ public class SysUserController extends BaseController
         userService.insertUserAuth(userId, roleIds);
         return ApiResult.success();
     }
+
+    /**
+     * 根据用户编号获取授权角色
+     */
+    @GetMapping("/getUserInfo")
+    public ApiResult getUserInfo(@RequestParam(value = "phonenumber", required = false) String phonenumber,
+                                 @RequestParam(value = "userName", required = false) String userName,
+                                 @RequestParam(value = "email", required = false) String email)
+    {
+        return ApiResult.success(userService.selectUserOne(phonenumber,userName,email));
+    }
 }

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

@@ -5,6 +5,7 @@ import com.usky.common.mybatis.core.CrudService;
 import com.usky.system.domain.SysUser;
 import com.usky.system.model.LoginUser;
 import com.usky.system.service.vo.SysUserNewVO;
+import com.usky.system.service.vo.TenantPlatformMenuVo;
 
 import java.util.List;
 
@@ -263,5 +264,9 @@ public interface ISysUserService extends CrudService<SysUser> {
 
     public List<SysUser> userAllList();
 
-
+    /**
+     * 根据手机号、用户名、邮箱查询用户信息
+     * @return 用户列表
+     */
+    List<SysUser> selectUserOne(String phonenumber,String userName,String email);
 }

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

@@ -54,6 +54,10 @@ public class SysTenantPlatformServiceImpl extends AbstractCrudService<SysTenantP
             queryWrapper.eq(SysTenantPlatform::getTenantId,tenantPlatformVo.getTenantId())
                     .eq(SysTenantPlatform::getIsDefault,1);
             this.remove(queryWrapper);
+            LambdaQueryWrapper<SysTenantPlatform> queryWrapper1 = Wrappers.lambdaQuery();
+            queryWrapper1.eq(SysTenantPlatform::getTenantId,tenantPlatformVo.getTenantId())
+                    .eq(SysTenantPlatform::getPlatformId,arr[0]);
+            this.remove(queryWrapper1);
             SysTenantPlatform sysTenantPlatform = new SysTenantPlatform();
             sysTenantPlatform.setTenantId(tenantPlatformVo.getTenantId());
             sysTenantPlatform.setPlatformId(arr[0]);

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

@@ -1,6 +1,8 @@
 package com.usky.system.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.datascope.annotation.DataScope;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.CommonPage;
@@ -684,4 +686,12 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         List<SysUser> list = userMapper.userAllList();
         return list;
     }
+
+    public List<SysUser> selectUserOne(String phonenumber,String userName,String email) {
+        LambdaQueryWrapper<SysUser> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(StringUtils.isNotBlank(phonenumber),SysUser::getPhonenumber,phonenumber)
+                .eq(StringUtils.isNotBlank(userName),SysUser::getUserName,userName)
+                .eq(StringUtils.isNotBlank(email),SysUser::getEmail,email);
+        return this.list(queryWrapper);
+    }
 }