From 0ff7ebece8c27244fd3e5ed28dfd61152948fbb9 Mon Sep 17 00:00:00 2001
From: tangqian <tangqian..110>
Date: Thu, 8 Jun 2023 15:51:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8E=A8=E5=B9=BF?=
 =?UTF-8?q?=E5=91=98=20=20=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AA=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/controller/admin/promoter/vo/PromoterPageReqVO.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterPageReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterPageReqVO.java
index 44939b62e..fe60cd55d 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterPageReqVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterPageReqVO.java
@@ -24,6 +24,7 @@ public class PromoterPageReqVO extends PageParam {
 
     @Schema(description = "推广员手机号", example = "15601691300")
     private String mobile;
+    private String sourceType;
 
     /**
      * 帐号状态

From acbce105f1e2c369cb10aae2fea12fb18cf22674 Mon Sep 17 00:00:00 2001
From: tangqian <tangqian..110>
Date: Thu, 8 Jun 2023 15:58:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8E=A8=E5=B9=BF?=
 =?UTF-8?q?=E5=91=98=20=20=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AA=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/promoter/PromoterMapper.xml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/promoter/PromoterMapper.xml b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/promoter/PromoterMapper.xml
index d1a4216e1..8f7e417de 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/promoter/PromoterMapper.xml
+++ b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/promoter/PromoterMapper.xml
@@ -10,7 +10,7 @@
      -->
 
     <select id="findListPage" resultType="cn.iocoder.yudao.module.member.controller.admin.promoter.vo.PromoterRespVO">
-        select a.id,a.user_id,a.dept_id,b.nickname,b.status,b.mobile,c.parent_organization_name as 'orgName' from member_promoter a
+        select a.id,a.user_id,a.dept_id,b.nickname,b.status,b.mobile,c.parent_organization_name as 'orgName',a.source_type from member_promoter a
                           left join member_user b on a.user_id = b.id
                             left join system_dept c on c.id=a.dept_id
         <where>
@@ -27,7 +27,7 @@
                 and b.mobile like CONCAT('%',#{data.mobile},'%')
             </if>
             <if test="data.sourceType!=null">
-                and b.source_type =#{data.sourceType}
+                and a.source_type =#{data.sourceType}
             </if>
         </where>
     </select>

From c3b086273576c24b69be1fd7302afd2004dc063c Mon Sep 17 00:00:00 2001
From: Jruome <2559028966@qq.com>
Date: Thu, 8 Jun 2023 16:00:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E6=8E=A8?=
 =?UTF-8?q?=E5=B9=BF=E5=91=98=E6=96=B0=E5=A2=9E=E6=B3=A8=E5=86=8C=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/views/member/promoter/index.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/yudao-ui-admin/src/views/member/promoter/index.vue b/yudao-ui-admin/src/views/member/promoter/index.vue
index e73389f91..67716639b 100644
--- a/yudao-ui-admin/src/views/member/promoter/index.vue
+++ b/yudao-ui-admin/src/views/member/promoter/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
 
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
       <el-form-item label="所属组织" prop="deptId">
         <treeselect style="width: 240px;" v-model="queryParams.deptId" :options="deptOptions" :show-count="true"
                     :clearable="false"
@@ -17,6 +17,12 @@
       <el-form-item label="推广员名称" prop="nickname">
         <el-input v-model="queryParams.nickname" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
+      <el-form-item label="注册来源" prop="sourceType">
+        <el-select v-model="queryParams.sourceType" placeholder="请选择来源" clearable  @keyup.enter.native="handleQuery">
+          <el-option :value="1" label="后台注册"/>
+          <el-option :value="2" label="扫码注册"/>
+        </el-select>
+      </el-form-item>
       <el-form-item label="手机号" prop="mobile">
         <el-input v-model="queryParams.mobile" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
@@ -50,6 +56,11 @@
       <el-table-column label="编号" align="center" prop="id"/>
       <el-table-column label="推广员名称" align="center" prop="nickname"/>
       <el-table-column label="手机号" align="center" prop="mobile"/>
+      <el-table-column label="注册来源" align="center" prop="sourceType">
+      <template v-slot="scope">
+        <div>{{scope.row.sourceType == 1?'后台注册':'扫码注册'}}</div>
+      </template>
+      </el-table-column>
       <el-table-column label="所属组织" align="center" prop="orgName"/>
       <el-table-column label="启用状态" align="center" prop="status">
         <template v-slot="scope">