Merge branch 'master_position' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -257,6 +257,9 @@ public class AppPermissionService {
         if (StringUtils.isBlank(mobilecodeRedis)) {
             return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "验证码错误");
         }
+        if(StringUtils.isNotBlank(code)||appUserDetailBiz.getUserByCode(code)==0){
+            return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "邀请人不存在");
+        }
         // 是否已存在
         AppUserLogin user = appUserLoginBiz.checkeUserLogin(username);
         if (null != user) {
@@ -309,9 +312,6 @@ public class AppPermissionService {
                     activityCode = codes[1];
                 }
                 parentId=appUserDetailBiz.getUserByCode(code);
-                if(parentId==null||parentId==0){
-                    return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "邀请人不存在");
-                }
             }
             if(parentId!=null&&parentId>0){
                 relationBiz.bindRelation(userid, parentId, 1);