Parcourir la source

Merge remote-tracking branch 'origin/test' into dev

anderx il y a 5 ans
Parent
commit
d421975314
1 fichiers modifiés avec 2 ajouts et 4 suppressions
  1. 2 4
      src/main/java/com/goafanti/common/mapper/AdminMapper.xml

+ 2 - 4
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -1093,11 +1093,11 @@
   </select>
   
    <select id="selectAdminCustomerDetailList"  resultType="com.goafanti.admin.bo.AdminCustomerDetailBo">
-  	select a.id,a.nickname as name,a.source,c.contacts,c.contact_mobile as contactMobile,
+select a.id,a.nickname as name,a.source,c.name contacts,c.mobile as contactMobile,
 	a.create_time as createTime,b.time_stamp as followTime
 	from user a 
 	left join (select uid,max(time_stamp) as time_stamp from user_follow group by uid) b  on a.id=b.uid
-	left join organization_identity c on a.id=c.uid
+	left join (select uid,name ,mobile from organization_contact_book where major=1) c on a.id=c.uid
 	where a.aid is not null and  a.share_type=0 and a.type=1
     <if test="aid != null"> 
 	and a.aid=  #{aid,jdbcType=VARCHAR}
@@ -1124,8 +1124,6 @@
   
   <select id="selectAdminCustomerDetailCount" parameterType="java.lang.String" resultType="java.lang.Integer">
   	select count(*) from user a 
-	left join (select uid,max(time_stamp) as time_stamp from user_follow group by uid) b  on a.id=b.uid
-	left join organization_identity c on a.id=c.uid
 	where a.aid is not null and  a.share_type=0 and a.type=1
 	 <if test="aid != null"> 
 	and a.aid=  #{aid,jdbcType=VARCHAR}