Browse Source

Merge remote-tracking branch 'origin/master' into prod

Conflicts:
	src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
wanghui 8 years ago
parent
commit
65f5c68a84

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

@@ -1420,10 +1420,10 @@
 		user_info c on b.id = c.uid
 	left join 
 		field_glossory d on a.field_a = d.id
-	where 
-		jmrh_flag = 1 and data_category = 2 and audit_status = 3
+	where
+		jmrh_flag = 1 and data_category = 1 and audit_status = 3
 	order by 
-		a.create_time desc
+		a.create_time asc
 	limit 5;
   </select>
 </mapper>

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -69,7 +69,7 @@ template.cacheable=false
 
 mobileCodeTemplate=SMS_37845022
 
-portal.host=//sf.jishutao.com/portal/1.0.9
+portal.host=//sf.jishutao.com/portal/1.0.11
 
 patentTemplate=SMS_72005286
 

File diff suppressed because it is too large
+ 1 - 0
src/main/webapp/WEB-INF/views/portal/index.html


+ 2 - 2
src/main/webapp/WEB-INF/views/portal/residentIntegration/index.html

@@ -74,7 +74,7 @@
 			<div class="patent_bottom">
 				<div class="col-xs-6 bg-left">
 					<ul>
-						<li th:each="it: ${jmrhTechnologyList}">
+						<li th:each="it: ${jmrhProjectList}">
 							<a th:href="${basePath+ '/portal/detail/achievementDetail.html?id=' + it.id +'&type=' + it.ownerType}">
 								<span class="note" th:text="${it.name}"></span>
 								<span th:if="${it.maturity == '1'}" class="node" >正在研发</span>
@@ -97,7 +97,7 @@
 				<div class="col-xs-6 imgt"><img th:src="${portalHost + '/img/cicm_3.png'}"/></div>
 				<div class="col-xs-6 bg-right">
 					<ul>
-						<li th:each="it: ${jmrhProjectList}">
+						<li th:each="it: ${jmrhTechnologyList}">
 							<a th:href="${basePath+ '/portal/detail/achievementDetail.html?id=' + it.id +'&type=' + it.ownerType}">
 								<span class="note" th:text="${it.name}"></span>
 								<span class="node" th:text="${it.industry}"></span>