Просмотр исходного кода

Merge branch 'test' of git@git.coding.net:aft/AFT.git into test

wanghui лет назад: 8
Родитель
Сommit
09c60727e8
1 измененных файлов с 15 добавлено и 15 удалено
  1. 15 15
      src/main/java/com/goafanti/common/mapper/MarketingManagementMapper.xml

+ 15 - 15
src/main/java/com/goafanti/common/mapper/MarketingManagementMapper.xml

@@ -354,7 +354,7 @@
   <select id="selectMarketList" resultType="com.goafanti.marketing.bo.MarketingManagementBo">
   	<if test="category == 1"> <!-- 成果 -->
   		select
-	x.id,
+	x.id as productId,
 	x.owner_type as ownerType,
 	x.summary,
 	x.name,
@@ -382,20 +382,20 @@ where x.audit_status = 3
 	and bi.domain_name like "%"#{url,jdbcType=VARCHAR}"%" 
   	</if>
   	<if test="category == 7"> <!-- 智者 -->
-  		select 
-  		u.id,i.username,u.ability_label as abilityLabel,
-  		u.introduction as achievement,u.head_portrait_url as headPortraitUrl,u.type,i.expert 
-  		from `user` u
-  		left join user_ability ua on u.id=ua.uid
-  		left join user_career c on u.id=c.uid
-  		left join user_identity i on u.id=i.uid
-  		right join expert_publish ep on ep.expert_id=u.id
-  		left join branch_information bi on bi.id=ep.publish_platform
-  		WHERE
-		u.type = 0 and 
-		i.expert = 1	
-		and ep.publish_client='0'
-		and ep.publish_page='W01'
+  		select
+                u.id,i.username,ua.ability_label as abilityLabel,
+                u.introduction as achievement,u.head_portrait_url as headPortraitUrl,u.type,i.expert
+                from `user` u
+                left join user_ability ua on u.id=ua.uid
+                left join user_career c on u.id=c.uid
+                left join user_identity i on u.id=i.uid
+                right join expert_publish ep on ep.expert_id=u.id
+                left join branch_information bi on bi.id=ep.publish_platform
+                WHERE
+                u.type = 0 and
+                i.expert = 1
+                and ep.publish_client='0'
+                and ep.publish_page='W01'
 		and bi.domain_name like "%"#{url,jdbcType=VARCHAR}"%" 
 		
   	</if>