bug fix

src/main/java/com/huiju/estateagents/controller/TaPersonController.java

@@ -164,6 +164,13 @@ public class TaPersonController extends BaseController {
         queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
         queryWrapper.eq("is_consultant",true);
         List<TaUser> users = taUserService.list(queryWrapper);
+
+        TaChannelPerson taChannelPerson = new TaChannelPerson();
+        taChannelPerson.setStatus(CommConstant.STATUS_DELETE);
+        QueryWrapper<TaChannelPerson> taChannelPersonQueryWrapper = new QueryWrapper<>();
+        taChannelPersonQueryWrapper.eq("person_id", person.getPersonId());
+        taChannelPersonService.update(taChannelPerson, taChannelPersonQueryWrapper);
+
         if(users.size()>0){
             TaUser user = users.get(0);
             person.setPersonType(CommConstant.PERSON_REALTY_CONSULTANT);

src/main/resources/mapper/TaChannelMapper.xml

@@ -38,7 +38,7 @@
         FROM
         ta_channel c
         LEFT JOIN ta_channel_person cp ON c.channel_id = cp.channel_id
-        LEFT JOIN ta_person tp on cp.person_id = tp.person_id and tp.person_type = 'estate agent'
+        LEFT JOIN ta_person tp on cp.person_id = tp.person_id and tp.person_type = 'estate agent' and cp.status = 1
         LEFT JOIN ta_recommend_customer rc ON cp.person_id = rc.recommend_person and rc.verify_status = 1 and rc.`status` = 1
         <where>
             <if test="channelId != null and channelId != ''">

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -86,7 +86,7 @@ FROM
         tc.channel_name as channelName
         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>
             a.person_type in ('estate agent', 'channel agent')
@@ -524,7 +524,7 @@ FROM
                 and a.org_id = #{orgId}
             </if>
             <if test="name != null and name != ''">
-                and a.nickname like concat('%', #{orgId}, '%')
+                and a.nickname like concat('%', #{name}, '%')
             </if>
             <if test="tel != null and tel != null">
                 and a.phone like concat('%', #{tel}, '%')