添加上级设置

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

@@ -66,12 +66,12 @@ 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=userDetailBiz.getUserInfoById(parentId);
+        }*/
+        AppUserVo appUserVo=userDetailBiz.getUserInfoById(parentId);
         if (appUserVo==null){
             log.info("----userId==="+userId+"----parentId===="+parentId+"----该上线用户不存在");
             return;

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

@@ -2,70 +2,29 @@ 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.admin.vo.InviteMemberVo;
-import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
-import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
-import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 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 io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-
 @RestController
 @RequestMapping("relation/admin")
 public class AdminUserRelationController extends BaseController<AppUserRelationBiz,AppUserRelation> {
 
-    @Autowired
-    private UserAuthUtil userAuthUtil;
-
-    @Autowired
-    private UserAuthConfig userAuthConfig;
-
-
-    @RequestMapping(value = "app/unauth/small/share",method = RequestMethod.GET)
-    @ApiModelProperty("小程序分享绑定")
-    public ObjectRestResponse share(
-            @RequestParam(value = "userid",defaultValue = "0")Integer userid,
-            @RequestParam(value = "pid",defaultValue = "0")Integer pid,
-            @RequestParam(value = "platform_userid",defaultValue = "0")Integer platform_userid
-    ){
-        return baseBiz.shareParentByUserId(userid,pid,platform_userid);
-    }
 
     @RequestMapping(value = "/bind",method = RequestMethod.POST)
-    @ApiModelProperty("app分享绑定")
+    @ApiModelProperty("后台绑定")
     public ObjectRestResponse bind(
-            @RequestParam(value = "code",defaultValue = "")String code,
-            HttpServletRequest request){
+            @RequestParam(value = "phone",defaultValue = "0")String phone,
+            @RequestParam(value = "userId",defaultValue = "0")Integer userId){
         try {
-            //屏蔽分享绑定
-        Integer userid = Integer.parseInt(userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId());
-        return baseBiz.appBindRelation(userid,code);
-        return ObjectRestResponse.succ();
+        return baseBiz.adminBindRelation(userId,phone);
         } catch (Exception e) {
             e.printStackTrace();
             throw new BaseException(e);
         }
     }
 
-    @ApiOperation("查询邀请的成员")
-    @GetMapping("/pages")
-    public ObjectRestResponse<InviteMemberVo> findInviteMemberByActivitState(@RequestParam(value = "state",required = false) Integer state,
-                                                                             @RequestParam("page") Integer page,
-                                                                             @RequestParam("limit") Integer limit,
-                                                                             HttpServletRequest request){
-        try {
-            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
-            InviteMemberVo inviteMemberVo =  baseBiz.findInviteMemberByActivitState(Integer.valueOf(infoFromToken.getId()),state,page,limit);
-          return ObjectRestResponse.succ(inviteMemberVo);
-        } catch (Exception e) {
-            throw new BaseException(e);
-        }
-    }
 
 }
\ No newline at end of file