Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -267,7 +267,7 @@ FROM
             <if test="consultTel != null and consultTel !=''">
                 and b.tel like CONCAT('%',#{consultTel}, '%')
             </if>
-            and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
+            and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)
         </where>
         order by b.create_date desc
     </select>
@@ -515,7 +515,7 @@ FROM
             <if test="consultTel != null and consultTel !=''">
                 and b.tel like CONCAT('%',#{consultTel}, '%')
             </if>
-            and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
+            and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)
         </where>
         order by b.create_date desc
     </select>