Merge branch 'master_position' into dev

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java

@@ -66,12 +66,13 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
             log.info("----userId==="+userId+"----parentId===="+parentId+"----自己不能成为自己的上线");
             return;
         }
-       /* AppUserVo appUserVo=userDetailBiz.getUserInfoById(userId);
+        /*AppUserVo appUserVo=userDetailBiz.getUserInfoById(userId);
         if (appUserVo==null){
             log.info("----userId==="+userId+"----parentId===="+parentId+"----该用户不存在");
             return;
         }*/
-        AppUserVo  appUserVo=userDetailBiz.getUserInfoById(parentId);
+
+        AppUserVo appUserVo=userDetailBiz.getUserInfoById(parentId);
         if (appUserVo==null){
             log.info("----userId==="+userId+"----parentId===="+parentId+"----该上线用户不存在");
             return;
@@ -123,6 +124,21 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
         }
         return  ObjectRestResponse.succ();
     }
+
+    //后台关系绑定
+    public  ObjectRestResponse  adminBindRelation(Integer userId,String phone){
+
+        if (StringUtils.isBlank(phone)||userId==null||userId==0){
+            return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
+        }
+        AppUserLogin userLogin=appUserLoginBiz.checkeUserLogin(phone);
+        if (userLogin==null){
+            return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"该上级不存在");
+        }
+        Integer parentId=userLogin.getId();
+        getMyBiz().bindRelation(userId,parentId,1);
+        return  ObjectRestResponse.succ();
+    }
     //永久稳定关系
     public void foreverBind(Integer user_id ){
         AppUserRelation relation=getMyBiz().getRelationByUserId(user_id);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AdminUserRelationController.java

+package com.github.wxiaoqi.security.admin.rest.admin;
+
+import com.github.wxiaoqi.security.admin.biz.AppUserRelationBiz;
+import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("relation/admin")
+public class AdminUserRelationController extends BaseController<AppUserRelationBiz,AppUserRelation> {
+
+
+    @RequestMapping(value = "/bind",method = RequestMethod.POST)
+    @ApiModelProperty("后台绑定")
+    public ObjectRestResponse bind(
+            @RequestParam(value = "phone",defaultValue = "0")String phone,
+            @RequestParam(value = "userId",defaultValue = "0")Integer userId){
+        try {
+        return baseBiz.adminBindRelation(userId,phone);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new BaseException(e);
+        }
+    }
+
+
+}
\ No newline at end of file