From 5e1ed925aed16164a9840eece046003daded3088 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 21 Dec 2022 15:19:30 +0800 Subject: [PATCH] 20221221 --- src/main/resources/mapper/modules/MallMemberMapper.xml | 8 +++----- src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml index 52cafce..898fee9 100644 --- a/src/main/resources/mapper/modules/MallMemberMapper.xml +++ b/src/main/resources/mapper/modules/MallMemberMapper.xml @@ -151,7 +151,7 @@ or find_in_set(m.invite_id, e.referrer_ids) ),0) amount FROM mall_member m - left join data_dictionary_custom a on a.code = m.level + left join data_dictionary_custom a on a.description = m.level <where> <if test="record != null" > <if test="record.name!=null and record.name!=''"> @@ -188,12 +188,10 @@ <select id="getAgentLevelListInPage" resultType="cc.mrbird.febs.mall.vo.AdminAgentLevelVo"> SELECT - a.id,b.description name + a.id,a.description name FROM data_dictionary_custom a - left JOIN data_dictionary_custom b on a.code = b.code - where a.type = 'AGENT_LEVEL_REQUIRE' - GROUP BY a.id + where a.type = 'MEMBER_AGENT_LEVEL' ORDER BY a.CREATED_TIME DESC </select> diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html index 4b68283..f461f34 100644 --- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html +++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html @@ -14,7 +14,7 @@ </div> <div class="layui-inline"> <div class="layui-input-inline"> - <input type="text" placeholder="手机号/邮箱/邀请码" name="account" autocomplete="off" class="layui-input"> + <input type="text" placeholder="手机号/邀请码" name="account" autocomplete="off" class="layui-input"> </div> </div> <div class="layui-inline"> -- Gitblit v1.9.1