团队

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

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.wxiaoqi.security.admin.biz.UserBusinessBiz;
 import com.github.wxiaoqi.security.admin.bo.UserTeamMemberBo;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,8 +25,8 @@ public class UserBussinessController {
     private UserBusinessBiz businessBiz;
 
      @GetMapping("/teams")
-     public ObjectRestResponse<PageDataVO<UserTeamMemberBo>> sda(@RequestParam("userId") Integer userId,@RequestParam("pageNo") Integer pageNo,@RequestParam("pageSize") Integer pageSize){
-         PageDataVO<UserTeamMemberBo> teamMemberBoPageDataVO = businessBiz.findTeamMemberPageByUserId(userId, pageNo, pageSize);
+     public ObjectRestResponse<PageDataVO<UserTeamMemberBo>> findTeamPage(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, AppUserDTO appUserDTO){
+         PageDataVO<UserTeamMemberBo> teamMemberBoPageDataVO = businessBiz.findTeamMemberPageByUserId(appUserDTO.getUserid(), pageNo, pageSize);
          return ObjectRestResponse.succ(teamMemberBoPageDataVO);
      }
 }

ace-modules/ace-admin/src/main/resources/mapper/AppUserRelationMapper.xml

@@ -4,6 +4,6 @@
 
 
     <select id="selectByLeaderId" resultType="com.github.wxiaoqi.security.admin.entity.AppUserRelation">
-        select `parent_id` as `parentId`,`user_id`as `userId`,`bind_time` as `bindTime` from `app_user_relation` where `parent_id`=#{leaderId} and `is_del`=0;
+        select `parent_id` as `parentId`,`user_id`as `userId`,`bind_time` as `bindTime` from `app_user_relation` where `parent_id`=#{leaderId} and `is_del`=0
     </select>
 </mapper>
\ No newline at end of file

ace-modules/ace-admin/src/main/resources/mapper/AppUserSellingWaterMapper.xml

@@ -5,7 +5,7 @@
 
     <select id="accquireIncomeByMemberIds" resultType="com.github.wxiaoqi.security.admin.bo.UserIncomeBo">
 SELECT DISTINCT
-	source_id,
+	`source_id`as userId,
         (( SELECT SUM(commission) FROM `app_user_selling_water` WHERE source_id=ausw.source_id AND `status` = 0 AND `waiting` = 1 )
         - ( SELECT SUM(commission) FROM `app_user_selling_water` WHERE source_id=ausw.source_id AND `status` = 1 AND `waiting` = 1 )) as `income`
 FROM