wanghui лет назад: 8
Родитель
Сommit
a7c06fcc4f

+ 1 - 1
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -549,7 +549,7 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value="/portal/thinkTank/policyList",method = RequestMethod.GET)
 	public ModelAndView policyList(ModelAndView modelview){
 		modelview.setViewName("/portal/thinkTank/policyList");
-		List<NewsPortalList> newsList = (List<NewsPortalList>)newsService.portalNewsList(5, 1, null, 1, null, null).getList();
+		List<NewsPortalList> newsList = (List<NewsPortalList>)newsService.portalNewsList(5, 1, null, null, null, null).getList();
 		modelview.addObject("newsList", newsList);
 		return modelview;
 	}

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

@@ -248,9 +248,11 @@
 		<if test="type != null and type != 0" >
 			and a.type = #{type,jdbcType=INTEGER}
 		</if>
+		<!-- 
 		<if test="hot != null">
 			and a.hot = #{hot,jdbcType=INTEGER}
-		</if>
+		</if> 
+		-->
 		<if test="keyword != null">
 			and a.title like concat('%',#{keyword},'%')
 		</if>	
@@ -270,10 +272,12 @@
 		</if>
 		<if test="type != null and type != 0" >
 			and a.type = #{type,jdbcType=INTEGER}
-		</if>	
+		</if>
+		<!-- 	
 		<if test="hot != null">
 			and a.hot = #{hot,jdbcType=INTEGER}
 		</if>
+		-->
 		<if test="keyword != null">
 			and a.title like concat('%',#{keyword},'%')
 		</if>

+ 6 - 3
src/main/java/com/goafanti/common/mapper/OrganizationInfoMapper.xml

@@ -225,7 +225,7 @@
 	on 
 		a.id = c.uid
 	where b.id is not null 
-	<!-- 	c.audit_status = 5 and a.type = 1 and b.identity_type = '企业' and b.company_type = 1  -->
+		and c.audit_status = 5 and a.type = 1 and b.identity_type = '企业' <!-- 	and b.company_type = 1  -->
 	order by 
 		a.create_time asc 
 	limit 0,10
@@ -251,8 +251,11 @@
 	where 
 	a.type = 1 and b.id is not null
 	and c.audit_status = 5 and a.type = 1 and b.identity_type = '企业' and b.company_type = 1
-	<if test="locationProvince != null and locationProvince != ''">
-		and b.location_province = #{locationProvince,jdbcType=VARCHAR}
+	<if test="provinceId != null and provinceId != ''">
+		and b.location_province = #{provinceId,jdbcType=VARCHAR}
+	</if>
+	<if test="keyword != null and keyword !=''">
+		and b.company_name like concat('%',#{keyword},'%')  
 	</if>
 	order by 
 		a.create_time desc