From ad22a1e5595b76436d005ba9f1f928ea094fe5c0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 22 Sep 2022 17:52:42 +0800
Subject: [PATCH] fix

---
 src/main/resources/mapper/modules/MallTeamLeaderMapper.xml |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml b/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
index 2b6fb88..16de05e 100644
--- a/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
+++ b/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
@@ -22,6 +22,7 @@
     <select id="selectApiLeaderListInPage" resultType="cc.mrbird.febs.mall.entity.MallTeamLeader">
         select
         a.*,
+        b.longlatiarr,
         ROUND(
             6378.138 * 2 * ASIN(
                 SQRT(
@@ -32,6 +33,7 @@
             ) * 1000
         ) AS distance
         from mall_team_leader a
+        inner join mall_electronic_fence b on b.team_leader_code = a.unique_code
         <where>
             a.state = 1 and a.online_state = 1
             <if test="record.query != null and record.query != ''">
@@ -117,6 +119,7 @@
                 and ( a.name like CONCAT('%', CONCAT(#{record.query}, '%'))
                     or a.phone like CONCAT('%', CONCAT(#{record.query}, '%'))
                     or a.take_code like CONCAT('%', CONCAT(#{record.query}, '%'))
+                    or b.goods_name like CONCAT('%', CONCAT(#{record.query}, '%'))
                     )
             </if>
             <if test="record.status == 4 and record.status != 0">
@@ -204,4 +207,11 @@
         and b.fence_name = #{fenceName}
     </select>
 
+    <select id="getAllMallTeamLeaderList" resultType="cc.mrbird.febs.mall.entity.MallTeamLeader">
+        select
+            a.*
+        from mall_team_leader a
+        where a.state = 1
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1