Преглед изворни кода

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

wanghui пре 8 година
родитељ
комит
158d198c35

+ 7 - 0
src/main/java/com/goafanti/common/mapper/DemandPublishMapper.xml

@@ -383,6 +383,10 @@ where 1=1
 	<if test="publishClient != null">
 		and dp.publish_client = #{publishClient,jdbcType=INTEGER}
 	</if>
+	
+	<if test="publishPage != null">
+		and dp.publish_page =#{publishPage,jdbcType=INTEGER}
+	</if>
 	<if test="ifTop != null">
 		and dp.if_top =#{ifTop,jdbcType=INTEGER}
 
@@ -403,6 +407,9 @@ where 1=1
 <if test="name != null">
   	and d.name like "%"#{name,jdbcType=VARCHAR}"%"
   	</if>
+  	<if test="publishPage != null">
+		and dp.publish_page =#{publishPage,jdbcType=INTEGER}
+	</if>
   	<if test="userName != null">
   	and d.owner_name = = #{userName,jdbcType=VARCHAR}
   	</if>

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

@@ -383,8 +383,8 @@ where x.audit_status = 3
   	</if>
   	<if test="category == 7"> <!-- 智者 -->
   		select 
-  		u.id,i.username,ua.ability_label as abilityLabel,
-  		c.achievement,u.head_portrait_url as headPortraitUrl,u.type,i.expert 
+  		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