From d5065b39eb4c39a85edd06c428f1adb5c9cb6b4c Mon Sep 17 00:00:00 2001
From: cheney <1251790704@qq.com>
Date: Fri, 26 Jan 2024 17:11:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=A5=E6=BA=90=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/huoran/users/entity/req/UserInfoReq.java    |  9 ++++++++-
 .../huoran/users/mapper/xml/HrUserAccountMapper.xml | 13 ++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/users/src/main/java/com/huoran/users/entity/req/UserInfoReq.java b/users/src/main/java/com/huoran/users/entity/req/UserInfoReq.java
index adfa780..b8afa9e 100644
--- a/users/src/main/java/com/huoran/users/entity/req/UserInfoReq.java
+++ b/users/src/main/java/com/huoran/users/entity/req/UserInfoReq.java
@@ -32,9 +32,16 @@ public class UserInfoReq {
     private String creationTime;
     @ApiModelProperty("结束时间")
     private String endTime;
-    @ApiModelProperty("平台id")
+
+    @ApiModelProperty("平台用户端权限，5幼儿园，6供应商，7个人端")
     private Integer platformId;
 
+    @ApiModelProperty("来源 1自行注册 ,注册该字段给值")
+    private Integer registration;
+
+    @ApiModelProperty("来源 2邀请 ,邀请该字段给值")
+    private Integer invite;
+
     private Integer pageNum;
 
     private Integer pageSize;
diff --git a/users/src/main/java/com/huoran/users/mapper/xml/HrUserAccountMapper.xml b/users/src/main/java/com/huoran/users/mapper/xml/HrUserAccountMapper.xml
index 3996d95..072027d 100644
--- a/users/src/main/java/com/huoran/users/mapper/xml/HrUserAccountMapper.xml
+++ b/users/src/main/java/com/huoran/users/mapper/xml/HrUserAccountMapper.xml
@@ -885,17 +885,16 @@
         <if test='userInfoReq.platformId !=null and userInfoReq.platformId !=""'>
             AND FIND_IN_SET(a.platform_id,#{userInfoReq.platformId})
         </if>
-
-        <if test='userInfoReq.provinceId !=null and userInfoReq.provinceId !=""'>
-            AND u.province_id = #{userInfoReq.provinceId}
-        </if>
-        <if test='userInfoReq.cityId !=null and userInfoReq.cityId !=""'>
-            and u.city_id =#{userInfoReq.cityId}
-        </if>
         <if test='userInfoReq.searchContent !=null and userInfoReq.searchContent !=""'>
             AND ( a.phone LIKE CONCAT('%',#{userInfoReq.searchContent},'%')
             OR u.user_name LIKE CONCAT('%',#{userInfoReq.searchContent},'%'))
         </if>
+        <if test='userInfoReq.registration !=null'>
+            and ta.invitation_account IS NULL
+        </if>
+        <if test='userInfoReq.invite !=null'>
+            AND ta.invitation_account IS NOT NULL
+        </if>
         GROUP BY a.app_open_id
         ORDER BY
         create_time DESC