Parcourir la source

Merge branch 'master' of jishutao/jitao-server into test

liliang4869 il y a 7 ans
Parent
commit
05a19176d1

+ 1 - 1
src/main/java/com/goafanti/demand/bo/DemandListBo.java

@@ -146,7 +146,7 @@ public class DemandListBo extends InputDemand{
 	public void setPictureUrl(String pictureUrl) {
 		// TODO Auto-generated method stub
 		super.setPictureUrl(pictureUrl);
-		if(pictureUrl!=null) {
+		if(pictureUrl!=null && pictureUrl.contains(".")) {
 			setFirstPic(pictureUrl.split(",")[0]);
 		}
 	}

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html

@@ -294,7 +294,7 @@
                        <address><img th:src="${portalHost+'/img/newMenu/achievement_28.jpg'}" alt="">
                        <span  th:if="${policy.provinceS}!=null and ${policy.cityS}!=null" th:text="${#strings.abbreviate(policy.provinceS+policy.cityS,8)}"></span>
                        <span class="title">《<span th:text="${#strings.abbreviate(policy.title,15)}"></span>》</span></address>
-                        <p th:utext="${#strings.abbreviate(policy.content,45)}"></p>
+                        <p th:text="${#strings.abbreviate(policy.summary,45)}"></p>
                     </div>
                     </a>
                 </li>