Ver código fonte

Merge branch 'test' of ssh://anderx@git.jishutao.com:55555/jishutao/jitao-server.git into test

anderx 7 anos atrás
pai
commit
72cfaabe62

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

@@ -27,9 +27,7 @@ import com.goafanti.common.bo.PolicyEntity;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.bo.fieldGlossoryBo;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.ProjectInterestMapper;
-import com.goafanti.common.enums.BusinessCategoryModule;
 import com.goafanti.common.enums.ConsultantType;
 import com.goafanti.common.model.AchievementInterest;
 import com.goafanti.common.model.Banners;
@@ -424,6 +422,12 @@ public class WebpageController extends BaseController {
 		List<JtBusinessProject> manageSysPro = jtBusinessService.getKJListByIds(5,1,12);
 		modelview.addObject("scienceProjectList", manageSysPro);
 		modelview.addObject("spc1", scienceProject1);
+		
+		//军民融合
+		/*JtBusinessCategory jmrh = jtBusinessService.getBusinessCategoryByLayerAndName(1, "军民融合");
+		List<JtBusinessProject> jlist = jtBusinessService.getKJListByIds(3,null,3);
+		modelview.addObject("jmrh", jmrh);
+		modelview.addObject("jlist", jlist);*/
 		/****************************以上是新修改的部分********************************************/
 		// 咨询师
 		List<UserIdentityBo> userIdentityBos = userIdentityService.getExperts(8);

+ 3 - 1
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -402,6 +402,8 @@ public class UserApiController extends BaseApiController {
 	 */
 	@RequestMapping(value = "/updateUserDetail", method = RequestMethod.POST)
 	public Result updateUserDetail(@Valid InputUserIdentity userIdentity, BindingResult bindingResult) {
+		//将电话号码置为空
+		userIdentity.setMobile(null);
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
@@ -650,7 +652,7 @@ public class UserApiController extends BaseApiController {
 		User user = new User();
 		user.setId(TokenManager.getUserId());
 		user.setIdentifyName(identifyName);
-		user.setMobile(mobile);
+		//user.setMobile(mobile);不修改电话号码
 		if(StringUtils.isNotBlank(email))user.setEmail(email);
 		user.setNickname(nickname);
 		userService.updateByPrimaryKeySelective(user);

+ 5 - 3
src/main/webapp/WEB-INF/views/portal/adviser/adviserDetail.html

@@ -1,7 +1,9 @@
 <!DOCTYPE html>
-<html lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
-<head>
+<head th:replace="common::header(~{::title},~{::link})">
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
@@ -17,7 +19,7 @@
     </div>
     <div class="container">
         <div class="componyLogo">
-            <div><img th:src="${portalHost+'/img/initPic/achievementInit.jpg'}" alt=""></div>
+            <div><img th:src="${adviserDetail.personPortraitUrl!=null ? avatarUploadHost + adviserDetail.personPortraitUrl : portalHost +'/img/initPic/achievementInit.jpg'}" alt=""></div>
             <p><span class="name" th:text="${adviserDetail.username}">李四光</span><span class="position" th:text="${adviserDetail.consultantTypeName}">专利代理人</span></p>
         </div>
         <div th:class="${adviserDetail.interested}==null?'heart':'heart active'"><span class="heart"></span><span class="nubCollect" th:text="${adviserDetail.countInterest}">55</span>次收藏</div>

+ 4 - 3
src/main/webapp/WEB-INF/views/portal/index.html

@@ -1,7 +1,8 @@
 <!DOCTYPE html>
-<html lang="en">
-
-<head>
+<html  xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head th:replace="common::header(~{::title},~{::link})">
 	<meta charset="UTF-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<meta http-equiv="X-UA-Compatible" content="ie=edge">

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/shopList.html