fix

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -92,7 +92,7 @@ FROM
             a.person_type in ('estate agent', 'channel agent')
             and a.status >0
             <if test="name != null and name !=''">
-                and a.nickname like concat('%', #{name}, '%')
+                and (a.nickname like concat('%', #{name}, '%') or  a.name like concat('%', #{name}, '%'))
             </if>
             <if test="tel != null and tel!=''">
                 and a.phone like concat('%', #{tel}, '%')
@@ -490,7 +490,7 @@ FROM
 
     <select id="getIndependentAgentsExport" resultType="com.huiju.estateagents.excel.AgentsRecommendCustomer">
         SELECT
-        a.nickname as nickname,
+        ifnull(a.nickname, a.name) as nickname,
         a.phone as phone,
         if(a.gender = '1', '男', if(a.gender = '2', '女', '未知')) as gender,
         '专业经纪人' as personType,
@@ -515,7 +515,7 @@ FROM
         ) AS recommedCount
         FROM
         ta_person a
-        left join ta_channel_person tcp on a.person_id = tcp.person_id
+        left join ta_channel_person tcp on a.person_id = tcp.person_id and tcp.status = 1
         left join ta_channel tc on tc.channel_id = tcp.channel_id
         <where>
             ifnull(a.person_type, '') in ('channel agent', 'estate agent')
@@ -524,7 +524,7 @@ FROM
                 and a.org_id = #{orgId}
             </if>
             <if test="name != null and name != ''">
-                and a.nickname like concat('%', #{name}, '%')
+                and (a.nickname like concat('%', #{name}, '%') or  a.name like concat('%', #{name}, '%'))
             </if>
             <if test="tel != null and tel != null">
                 and a.phone like concat('%', #{tel}, '%')