From 62178841d6cb5af2670e650c59fec07ae915dc5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= <zhanglian.zl@fcbox.com>
Date: Fri, 26 Jan 2024 14:11:52 +0800
Subject: [PATCH] 123

---
 .../com/ruoyi/cai/controller/app/InviteAppController.java     | 4 ++--
 .../src/main/java/com/ruoyi/cai/mapper/UserInviteMapper.java  | 3 ++-
 .../main/java/com/ruoyi/cai/service/UserInviteService.java    | 2 +-
 .../com/ruoyi/cai/service/impl/UserInviteServiceImpl.java     | 4 ++--
 ruoyi-cai/src/main/resources/mapper/cai/UserInviteMapper.xml  | 3 +++
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/InviteAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/InviteAppController.java
index b4290dc1..2d10527a 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/InviteAppController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/InviteAppController.java
@@ -39,9 +39,9 @@ public class InviteAppController {
     @GetMapping("/user/page")
     @Operation(summary = "我邀请的人")
     @Log(title = "我邀请的人", businessType = BusinessType.OTHER, isSaveDb = false)
-    public R<List<UserListVo>> inviteUserPage(PageQuery pageQuery){
+    public R<List<UserListVo>> inviteUserPage(PageQuery pageQuery,String usercode){
         Long userId = LoginHelper.getUserId();
-        Page<UserListVo> userPage = userInviteService.inviteUserPage(pageQuery,userId);
+        Page<UserListVo> userPage = userInviteService.inviteUserPage(pageQuery,userId,usercode);
         return R.ok(userPage.getRecords());
     }
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserInviteMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserInviteMapper.java
index cef4b4df..5517dee9 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserInviteMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserInviteMapper.java
@@ -18,7 +18,8 @@ public interface UserInviteMapper extends BaseMapper<UserInvite> {
 
     InviteCountDTO countInviteAndReward(@Param("userId") Long userId);
 
-    Page<UserListVo> inviteUserPage(@Param("build") Page<Object> build, @Param("inviteId") Long inviteId);
+    Page<UserListVo> inviteUserPage(@Param("build") Page<Object> build, @Param("inviteId") Long inviteId,
+                                    @Param("usercode") String usercode);
 
     Page<UserInviteAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") UserInviteAdminVo bo);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserInviteService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserInviteService.java
index de6203f8..285f8417 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserInviteService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserInviteService.java
@@ -20,7 +20,7 @@ public interface UserInviteService extends IService<UserInvite> {
 
     InviteHomeVo inviteHome(Long userId);
 
-    Page<UserListVo> inviteUserPage(PageQuery pageQuery, Long inviteId);
+    Page<UserListVo> inviteUserPage(PageQuery pageQuery, Long inviteId,String usercode);
 
     Page<UserInviteAdminVo> pageAdmin(PageQuery pageQuery, UserInviteAdminVo bo);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInviteServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInviteServiceImpl.java
index 3ccd80a5..ca57d150 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInviteServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInviteServiceImpl.java
@@ -56,8 +56,8 @@ public class UserInviteServiceImpl extends ServiceImpl<UserInviteMapper, UserInv
      * 获取我邀请的人
      */
     @Override
-    public Page<UserListVo> inviteUserPage(PageQuery pageQuery, Long inviteId) {
-        return baseMapper.inviteUserPage(pageQuery.build(),inviteId);
+    public Page<UserListVo> inviteUserPage(PageQuery pageQuery, Long inviteId,String usercode) {
+        return baseMapper.inviteUserPage(pageQuery.build(),inviteId,usercode);
     }
 
     @Override
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/UserInviteMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserInviteMapper.xml
index 63e5931b..8b808575 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/UserInviteMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserInviteMapper.xml
@@ -26,6 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from cai_user_invite t1
         join cai_user t2 on t1.user_id = t2.id
         where t1.invite_id = #{inviteId}
+        <if test="usercode != null and usercode != ''">
+            and t2.usercode = #{usercode}
+        </if>
     </select>
     <select id="pageAdmin" resultType="com.ruoyi.cai.dto.admin.vo.UserInviteAdminVo">
         select t1.*,