Browse Source

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

liliang4869 7 years ago
parent
commit
71e5f3933d

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

@@ -504,6 +504,7 @@ public class PublicController extends BaseController {
 		}
 		User user=userService.selectByNameAndType(userName, null);
 		user.setPassword(newPwd);
+		user.setPassword(passwordUtil.getEncryptPwd(user));
 		userService.updateByPrimaryKeySelective(user);
 		return res;
 		

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

@@ -373,7 +373,7 @@ public class WebpageController extends BaseController {
 	public ModelAndView demandList(HttpServletRequest request, ModelAndView modelview) {
 		String url =com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
 		modelview.setViewName("/portal/technologyTrading/demandList");
-		List<DemandListBo> boutiques=demandService.getHotDemand(3, url, "");
+		List<DemandListBo> boutiques=demandService.getHotDemand(3, url, "web_demand_list");
 		modelview.addObject("boutiques",boutiques);
 		return modelview;
 	}

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

@@ -293,8 +293,8 @@
                     <div class="introduce">
                        <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,12)}"></span>》</span></address>
-                        <p th:text="${#strings.abbreviate(policy.summary,45)}"></p>
+                       <span class="title">《<span th:text="${#strings.abbreviate(policy.title,15)}"></span>》</span></address>
+                        <p th:text="${#strings.abbreviate(policy.content,45)}"></p>
                     </div>
                     </a>
                 </li>