Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/test' into patch

anderx 7 gadi atpakaļ
vecāks
revīzija
04fe212013

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

@@ -1430,10 +1430,11 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value = "/portal/service/safeguarding", method = RequestMethod.GET)
 	public ModelAndView portalServiceSafeguarding(HttpServletRequest request, ModelAndView modelview){
 		//获得法律顾问列表数据
-		String id = TokenManager.getUserId();
-		if(null != id){
-			modelview.addObject("userType", userService.selectByPrimaryKey(id).getType());
+		User u = userService.selectByPrimaryKey(TokenManager.getUserId());
+		if(null != u&&u.getType()!=null){
+			modelview.addObject("userType",u.getType() );
 		}
+		
 		modelview.addObject("slist", userIdentityService.consultantList( null, 1,  4,  null, null, null,  0,  12).getList());
 		modelview.setViewName("/portal/service/safeguarding");
 		return modelview;
@@ -1482,9 +1483,9 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value = "/portal/adviser", method = RequestMethod.GET)
 	public ModelAndView portalAdviser(ModelAndView modelview){
 		modelview.setViewName("/portal/adviser");
-		String id = TokenManager.getUserId();
-		if(null != id){
-			modelview.addObject("userType", userService.selectByPrimaryKey(id).getType());
+		User u = userService.selectByPrimaryKey(TokenManager.getUserId());
+		if(null != u&&u.getType()!=null){
+			modelview.addObject("userType",u.getType() );
 		}
 		return modelview;
 	}

+ 7 - 9
src/main/webapp/WEB-INF/views/common.html

@@ -98,23 +98,21 @@
 						<img th:src="${portalHost+'/img/index/index_webkit2.png'}" alt="">
 					</span>
 					<p>
-						<a th:href="@{/portal/service/serviceIndex#serviceHigh}">高新技术企业服务</a>
+						<a th:href="@{/portal/service/serviceIndex#Md2}">品牌建设</a>
 					</p>
 					<p>
-						<a th:href="@{/portal/service/serviceIndex#serviceAuthentication}">企业资质认定</a>
+						<a th:href="@{/portal/service/serviceIndex#Md3}">市场开拓</a>
 					</p>
 					<p>
-						<!-- <a th:href="@{/portal/service/serviceIndex#serviceProperty}">知识产权</a> -->
-						<a th:href="@{/portal/service/serviceIndex#serviceProject}">科技项目</a>
-						<a th:href="@{/portal/service/serviceIndex#serviceCustomer}">合作客户</a>
+						<a th:href="@{/portal/service/serviceIndex#Md4}">政府扶持</a>
 					</p>
 					<p>
-						<a th:href="@{/portal/service/serviceIndex#serviceAdministration}">管理体系</a>
-						<a th:href="@{/portal/service/serviceIndex#serviceAbility}">服务能力</a>
+						<a th:href="@{/portal/service/serviceIndex#Md5}">减税免税</a>
+						<a th:href="@{/portal/service/serviceIndex#Md6}">融资租售   </a>
 					</p>
 					<p>
-						<!-- <a th:href="@{/portal/service/serviceIndex#serviceProcess}">服务流程</a> -->
-						<a th:href="@{/portal/service/serviceIndex#serviceBrand}">品牌通   </a>
+						<a th:href="@{/portal/service/serviceIndex#Md7}">攻防利器</a>
+						<a th:href="@{/portal/service/serviceIndex#Md7}">他山己用</a>
 					</p>
 				</li>
 				<li>