diff --git a/api/accountFiee/accountFiee.pb.go b/api/accountFiee/accountFiee.pb.go index e172852..ecdb753 100644 --- a/api/accountFiee/accountFiee.pb.go +++ b/api/accountFiee/accountFiee.pb.go @@ -1195,6 +1195,8 @@ type UserListRequest struct { Ids []int64 `protobuf:"varint,11,rep,packed,name=ids,proto3" json:"ids"` Nationality string `protobuf:"bytes,12,opt,name=nationality,proto3" json:"nationality"` NameAndNumber string `protobuf:"bytes,13,opt,name=nameAndNumber,proto3" json:"nameAndNumber"` + Email string `protobuf:"bytes,14,opt,name=email,proto3" json:"email"` + AbroadTel string `protobuf:"bytes,15,opt,name=abroadTel,proto3" json:"abroadTel"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -1320,6 +1322,20 @@ func (x *UserListRequest) GetNameAndNumber() string { return "" } +func (x *UserListRequest) GetEmail() string { + if x != nil { + return x.Email + } + return "" +} + +func (x *UserListRequest) GetAbroadTel() string { + if x != nil { + return x.AbroadTel + } + return "" +} + type UserInfoResponse struct { state protoimpl.MessageState `protogen:"open.v1"` Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` @@ -10377,7 +10393,7 @@ const file_api_accountFiee_accountFiee_proto_rawDesc = "" + "\x11AbroadTelAreaCode\x18\x19 \x01(\tR\x11AbroadTelAreaCode\x12\x1c\n" + "\tAbroadTel\x18\x1a \x01(\tR\tAbroadTel\x12 \n" + "\vinviterName\x18\x1b \x01(\tR\vinviterName\x12 \n" + - "\vinviterCode\x18\x1c \x01(\tR\vinviterCode\"\xff\x02\n" + + "\vinviterCode\x18\x1c \x01(\tR\vinviterCode\"\xb3\x03\n" + "\x0fUserListRequest\x12\x16\n" + "\x06domain\x18\x01 \x01(\tR\x06domain\x12\x16\n" + "\x06subNum\x18\x02 \x01(\tR\x06subNum\x12$\n" + @@ -10392,7 +10408,9 @@ const file_api_accountFiee_accountFiee_proto_rawDesc = "" + " \x01(\tR\vblurNameTel\x12\x10\n" + "\x03ids\x18\v \x03(\x03R\x03ids\x12 \n" + "\vnationality\x18\f \x01(\tR\vnationality\x12$\n" + - "\rnameAndNumber\x18\r \x01(\tR\rnameAndNumber\"\x92\x06\n" + + "\rnameAndNumber\x18\r \x01(\tR\rnameAndNumber\x12\x14\n" + + "\x05email\x18\x0e \x01(\tR\x05email\x12\x1c\n" + + "\tabroadTel\x18\x0f \x01(\tR\tabroadTel\"\x92\x06\n" + "\x10UserInfoResponse\x12\x0e\n" + "\x02id\x18\x01 \x01(\x04R\x02id\x12\x16\n" + "\x06status\x18\x02 \x01(\x05R\x06status\x12\x12\n" + diff --git a/api/accountFiee/accountFiee.proto b/api/accountFiee/accountFiee.proto index 9894fc8..5c53308 100644 --- a/api/accountFiee/accountFiee.proto +++ b/api/accountFiee/accountFiee.proto @@ -220,6 +220,8 @@ message UserListRequest{ repeated int64 ids = 11; string nationality = 12; string nameAndNumber = 13; + string email = 14; + string abroadTel = 15; } message UserInfoResponse{ uint64 id = 1; diff --git a/pkg/service/account.go b/pkg/service/account.go index 5ac8e12..8a1fa53 100644 --- a/pkg/service/account.go +++ b/pkg/service/account.go @@ -726,6 +726,12 @@ func (a *AccountFieeProvider) UserList(ctx context.Context, in *account.UserList if in.Nationality != "" { modelObj.Where("RealName.nationality like ? ", "%"+in.Nationality+"%") } + if in.Email != "" { + modelObj.Where("email like ? ", "%"+in.Email+"%") + } + if in.AbroadTel != "" { + modelObj.Where("abroad_tel like ? ", "%"+in.AbroadTel+"%") + } if in.DocumentType != 0 { modelObj.Where("RealName.document_type = ? ", in.DocumentType) }