bug fix

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -111,13 +111,13 @@ FROM
         SELECT
         a.*,
         a.customer_id AS customerId,
-        if(b.NAME  = null, d.name, b.name) as consultantName,
-        if(b.tel  = null, d.tel, b.tel) AS consultTel,
+        IFNULL(d.user_name, b.name) as consultantName,
+        IFNULL(d.phone, b.tel) as consultTel,
         c.building_name as intentionName
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
-        LEFT JOIN ta_person d on a.realty_consultant = d.user_id
+        LEFT JOIN ta_user d on a.realty_consultant = d.user_id
         LEFT JOIN ta_building c ON a.building_id = c.building_id
         <where>
             a.status > 0
@@ -135,10 +135,10 @@ FROM
                 and a.phone like concat(concat("%",#{tel}),"%")
             </if>
             <if test="consultName != null and consultName !=''">
-                and b.name like CONCAT('%',#{consultName}, '%')
+                and IFNULL(d.user_name, b.name) like CONCAT('%',#{consultName}, '%')
             </if>
             <if test="consultTel != null and consultTel !=''">
-                and b.tel = #{consultTel}
+                and IFNULL(d.phone, b.tel) = #{consultTel}
             </if>
             <if test="entryType != null and entryType !=''">
                 and a.entry_type = #{entryType}
@@ -377,11 +377,12 @@ FROM
         a.phone as phone,
         c.building_name as intentionName,
         if(a.sex = 1, '男',if(a.sex = 2, '女', '未知')) as sex,
-        b.NAME AS consultantName,
-        b.tel AS consultTel
+        IFNULL(d.user_name, b.name) as consultantName,
+        IFNULL(d.phone, b.tel) as consultTel
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        LEFT JOIN ta_user d on a.realty_consultant = d.user_id
         LEFT JOIN ta_building c ON a.building_id = c.building_id
         <where>
             a.status > 0
@@ -399,10 +400,10 @@ FROM
                 and a.phone like concat(concat("%",#{tel}),"%")
             </if>
             <if test="consultName != null and consultName !=''">
-                and b.name like CONCAT('%',#{consultName}, '%')
+                and IFNULL(d.user_name, b.name) like CONCAT('%',#{consultName}, '%')
             </if>
             <if test="consultTel != null and consultTel !=''">
-                and b.tel = #{consultTel}
+                and IFNULL(d.phone, b.tel) = #{consultTel}
             </if>
             <if test="entryType != null and entryType !=''">
                 and a.entry_type = #{entryType}