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 @@ AND FIND_IN_SET(a.platform_id,#{userInfoReq.platformId}) - - - AND u.province_id = #{userInfoReq.provinceId} - - - and u.city_id =#{userInfoReq.cityId} - AND ( a.phone LIKE CONCAT('%',#{userInfoReq.searchContent},'%') OR u.user_name LIKE CONCAT('%',#{userInfoReq.searchContent},'%')) + + and ta.invitation_account IS NULL + + + AND ta.invitation_account IS NOT NULL + GROUP BY a.app_open_id ORDER BY create_time DESC