Merge branch 'system-zyj' of uskycloud/usky-cloud into master

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

@@ -48,10 +48,7 @@ public class SendSmsController {
 
     @GetMapping("/noteSending")
     public ApiResult<Void> noteSending(@RequestParam Integer tenantId,@RequestParam String phone) {
-        SysUser loginUser = sysUserService.getAppUserInfo(null, tenantId, phone);
-        if(Objects.isNull(loginUser)){
-            throw new BusinessException("手机号未注册");
-        }
+        sysUserService.getAppUserInfo(null, tenantId, phone);
 
         DefaultProfile profile = DefaultProfile.getProfile("cn-beijing", "LTAI9WERPIFIlHDg", "p7SQ0rYpraebcdoJ0l3tOtYmmgrR4q");
         String code = String.valueOf(new Random().nextInt(1000000));

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

@@ -504,6 +504,9 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
        } else if (!StringUtils.isBlank(phone)) {
            sysUser = userMapper.selectUserDataOne(tenantId,phone);
        }
+       if(Objects.isNull(sysUser)){
+           throw new BusinessException("用户信息未注册");
+       }
        List<SysRole> sysRoles = roleMapper.selectRolePermissionByUserId(sysUser.getUserId());
        List<SysRoleVO> collect = sysRoles.stream().map(sysRole -> {
            SysRoleVO sysRoleVO = new SysRoleVO();