From db88b87df461820152d68d3d55a28f30c2da83e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 九月 2019 17:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/mapping/brand/BrandInfoRecordMapper.xml |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/brand/BrandInfoRecordMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/brand/BrandInfoRecordMapper.xml
index 5440936..7fdaebd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/brand/BrandInfoRecordMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/brand/BrandInfoRecordMapper.xml
@@ -86,4 +86,18 @@
 		 <if test="uid != null">AND bir_uid = #{uid}</if>
   	     <if test="device != null">AND bir_device = #{device}</if>
   </select>
+  
+  
+   <select id="listValidByCidToApp" resultMap="BaseResultMap">
+    SELECT * FROM 
+        (SELECT bir_id FROM yeshi_ec_brand_info_record
+		WHERE bir_state = 0 
+		   <if test="uid != null">AND bir_uid = #{uid}</if>
+  	       <if test="device != null">AND bir_device = #{device}</if>
+		GROUP BY bir_bid)A 
+	LEFT JOIN yeshi_ec_brand_info_record h on  A.bir_id = h.bir_id
+	LEFT JOIN `yeshi_ec_brand_info` p ON h.`bir_bid` = p.`bf_id`
+	ORDER BY  h.bir_update_time DESC
+	LIMIT ${start},${count}
+  </select>
 </mapper>

--
Gitblit v1.8.0