bug 修复

src/main/java/com/yunzhi/marketing/xlk/service/impl/InstitutionServiceImpl.java

@@ -74,7 +74,7 @@ public class InstitutionServiceImpl extends ServiceImpl<InstitutionMapper, Insti
     public ResponseBean deleteByinstitutionCode(String id) {
         Institution institution = institutionMapper.selectById(id);
         LambdaQueryWrapper<Institution> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.likeLeft(Institution::getInstitutionCode,institution.getInstitutionCode());
+        queryWrapper.likeRight(Institution::getInstitutionCode,institution.getInstitutionCode());
         List<Institution> institutions = institutionMapper.selectList(queryWrapper);
         if (institutions.size() > 1) {
             return ResponseBean.error("请先删除子公司", ResponseBean.ERROR_UNAVAILABLE);

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -808,39 +808,42 @@ FROM
 
     <select id="getMyCustFollowOrClinch" resultType="com.yunzhi.marketing.entity.TaRecommendCustomer">
         SELECT
-        *
+        IFNULL( p.nickname, t.NAME ) AS NAME,
+        IFNULL( p.avatarurl, t.picture ) AS picture,
+        t.*
         FROM
-        ta_recommend_customer
+        ta_recommend_customer t
+        LEFT JOIN ta_person p ON t.person_id = p.person_id
         WHERE
-        org_id = #{orgId}
-        AND ( realty_consultant = #{personId} OR realty_consultant = #{userId} )
+        t.org_id = #{orgId}
+        AND ( t.realty_consultant = #{personId} OR t.realty_consultant = #{userId} )
         <if test="type == 'follow'">
-            AND STATUS != 4
-            AND verify_status = 1
+            AND t.STATUS != 4
+            AND t.verify_status = 1
             <if test="name != null and name !=''">
-                and (`name` like CONCAT('%',#{name}, '%') or phone like CONCAT('%',#{name}, '%'))
+                and (p.nickname like CONCAT('%',#{name}, '%') or t.`name` like CONCAT('%',#{name}, '%') or t.phone like CONCAT('%',#{name}, '%'))
             </if>
             <if test="phone != null and phone !=''">
-                and phone like CONCAT('%',#{phone}, '%')
+                and t.phone like CONCAT('%',#{phone}, '%')
             </if>
             <if test="status != null and status !=''">
-                and status = #{status}
+                and t.status = #{status}
             </if>
             <if test="startReportDate != null and startReportDate !=''">
-                and date_format( report_date, '%Y-%m-%d' ) >= #{startReportDate}
+                and date_format( t.report_date, '%Y-%m-%d' ) >= #{startReportDate}
             </if>
             <if test="endReportDate != null and endReportDate !=''">
-                and date_format( report_date, '%Y-%m-%d' ) &lt;= #{endReportDate}
+                and date_format( t.report_date, '%Y-%m-%d' ) &lt;= #{endReportDate}
             </if>
             <if test="startArrivalDate != null and startArrivalDate !=''">
-                and date_format( arrival_date, '%Y-%m-%d' ) >= #{startArrivalDate}
+                and date_format( t.arrival_date, '%Y-%m-%d' ) >= #{startArrivalDate}
             </if>
             <if test="endArrivalDate != null and endArrivalDate !=''">
-                and date_format( arrival_date, '%Y-%m-%d' ) &lt;= #{endArrivalDate}
+                and date_format( t.arrival_date, '%Y-%m-%d' ) &lt;= #{endArrivalDate}
             </if>
         </if>
         <if test="type == 'clinch'">
-            AND STATUS = 4
+            AND t.STATUS = 4
         </if>
     </select>