bug fix

src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java

@@ -302,5 +302,5 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param buildingId
      * @return
      */
-    Map<String, Number> checkCustomerBy(@Param("orgId") Integer orgId, @Param("personId") String personId, @Param("consultBuildingIds") List<String> consultBuildingIds, @Param("buildingId") String buildingId);
+    Map<String, Number> checkCustomerBy(@Param("orgId") Integer orgId, @Param("personId") String personId, @Param("consultBuildingIds") List<String> consultBuildingIds, @Param("buildingId") String buildingId, @Param("consultPersonId")String consultPersonId, @Param("userId")Integer userId);
 }

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

@@ -193,10 +193,11 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         from.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
         from.setCreateDate(now);
 
-        Map<String, Number> checkNum = taRecommendCustomerMapper.checkCustomerBy(orgId, person.getPersonId(), consultBuildingIds, null != building ? building.getBuildingId() : null);
+        Map<String, Number> checkNum = taRecommendCustomerMapper.checkCustomerBy(orgId, person.getPersonId(), consultBuildingIds, null != building ? building.getBuildingId() : null, consultant != null ? consultant.getPersonId() : null, consultant != null ? consultant.getUserId() : null);
         boolean hasOrgCust = checkNum.get("orgNum").intValue() > 0;
-        boolean hasConsultCust = checkNum.get("consultNum").intValue() > 0;
+        boolean hasConsultBingBuildCust = checkNum.get("consultBindBuildingNum").intValue() > 0;
         boolean hasBuildingCust = checkNum.get("buildingNum").intValue() > 0;
+        boolean hasConstCust = checkNum.get("consultNum") == null ? true : checkNum.get("consultNum").intValue() > 0;
 
         // 控制是否需要插入小程序级别公客
         boolean inserted = false;
@@ -206,7 +207,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         boolean personTypeFlag = CommConstant.PERSON_REALTY_CONSULTANT.equals(person.getPersonType()) ? true : false;
 
         // 私客
-        if (null != consultant && !hasConsultCust && null != consultBuildings) {
+        if (null != consultant && hasConsultBingBuildCust && null != consultBuildings && !hasConstCust) {
             TaBuilding taBuilding = null;
             if (consultBuildingIds.contains(null != building ? building.getBuildingId() : null)) {
                 taBuilding = building;

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -951,9 +951,13 @@
                 COALESCE(sum( IF ( t.building_id IN ('****')
             </otherwise>
         </choose>
-            , 1, 0 ) ), 0) AS consultNum,
+            , 1, 0 ) ), 0) AS consultBindBuildingNum,
 
             COALESCE(sum( IF ( t.building_id = #{buildingId}, 1, 0 ) ), 0) AS buildingNum
+        <if test="userId != null and userId != ''">
+            ,COALESCE(sum( IF ( t.realty_consultant in (#{consultPersonId}, #{userId}), 1, 0 ) ), 0) AS consultNum
+        </if>
+
         FROM
             ta_recommend_customer t
         WHERE