From 509d0884e12ae33b94226f4fb7105b9808a1bed9 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 15 Jul 2020 10:20:58 +0800 Subject: [PATCH] 20200715 代码提交 --- src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 3 ++- src/main/resources/mapper/modules/MemberMapper.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java index 6638570..0c42786 100644 --- a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java +++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java @@ -144,7 +144,8 @@ * 是否设置预估强平价系数 0-否1-是 */ private Integer isForce; - + @TableField(exist = false) + private String account; @TableField(exist = false) private String firstName; diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml index bdf67a3..a5d9f63 100644 --- a/src/main/resources/mapper/modules/MemberMapper.xml +++ b/src/main/resources/mapper/modules/MemberMapper.xml @@ -16,7 +16,7 @@ <if test="record.endTime!=null"> and #{record.endTime} >= m.create_time </if> - <if test="record.account!=null and record.account!=''"> + <if test="record.account!=null"> and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account}) </if> <if test="record.accountStatus!=null"> -- Gitblit v1.9.1