Преглед изворни кода

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

anderx пре 7 година
родитељ
комит
c2e1c561ab

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

@@ -1406,6 +1406,10 @@ 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(TokenManager.getUserToken().getId()).getType());
+		}
 		modelview.addObject("slist", userIdentityService.consultantList( null, 1,  4,  null, null, null,  0,  12).getList());
 		modelview.setViewName("/portal/service/safeguarding");
 		return modelview;
@@ -1454,6 +1458,10 @@ 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(TokenManager.getUserToken().getId()).getType());
+		}
 		return modelview;
 	}
 	/**

+ 2 - 0
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -113,4 +113,6 @@ public interface UserMapper {
 	Integer selectByMobieAndTypeCount(String mobile);
 	
 	List<JtMessageConsumer> getAllUser();
+	
+	int getCountByMobile(@Param("id")String id,@Param("mobile")String mobile);
 }

+ 4 - 0
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -1246,5 +1246,9 @@
 		and username like #{u,jdbcType=VARCHAR}
 		</if>
 	</select>
+	<!-- 验证手机号码是否重复 -->
+	<select id="getCountByMobile" parameterType="com.goafanti.common.model.User" resultType="java.lang.Integer">
+		select count(0) from user where mobile = #{mobile,jdbcType=VARCHAR} and id &lt;&gt; #{id,jdbcType=VARCHAR}
+	</select>
 
 </mapper>

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

@@ -3,6 +3,8 @@ package com.goafanti.user.controller;
 import java.math.BigDecimal;
 import java.util.Base64;
 import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -701,9 +703,27 @@ public class UserApiController extends BaseApiController {
 		User user = new User();
 		user.setId(TokenManager.getUserId());
 		user.setIdentifyName(identifyName);
-		//user.setMobile(mobile);不修改电话号码
+		if(StringUtils.isNotEmpty(mobile)){
+			//验证手机号码格式是否正确
+			Pattern p = Pattern.compile("^[1][3,4,5,7,8][0-9]{9}$"); // 验证手机号           
+			Matcher m = p.matcher(mobile);   
+			if(!m.matches()){
+				res.getError().add(buildError("电话号码格式不对","电话号码格式不对"));
+			}else{
+				//验证手机是否存在
+				int i = userService.getCountByMobile(user.getId(),mobile);
+				if(i>0){
+					res.getError().add(buildError("电话号码重复","电话号码重复"));
+				}else{
+					user.setMobile(mobile);//修改电话号码
+				}
+			}
+		}
 		if(StringUtils.isNotBlank(email))user.setEmail(email);
 		user.setNickname(nickname);
+		if(res.getError().size()>0){
+			return res;
+		}
 		userService.updateByPrimaryKeySelective(user);
 		return res;
 	}

+ 6 - 0
src/main/java/com/goafanti/user/service/UserService.java

@@ -63,5 +63,11 @@ public interface UserService {
 	
 	Pagination<User> getUserInfo(User user, Integer pageNo, Integer pageSize);
 	
+	/**
+	 * 查看除了自己是否还有其他人使用这个号码
+	 * @param user
+	 * @return
+	 */
+	int getCountByMobile(String id, String mobile);
 	
 }

+ 5 - 0
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -241,4 +241,9 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 		params.put("user", user);
 		return  (Pagination<User>) findPage("getUserInfoList", "getUserInfoCount", params, pageNo, pageSize);
 	}
+
+	@Override
+	public int getCountByMobile(String id,String mobile) {
+		return userMapper.getCountByMobile(id,mobile);
+	}
 }

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

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <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">
@@ -27,7 +27,7 @@
                     </span>
                 </div>
             </div>
-            <span>我要成为顾问</span>
+            <span th:if="${userType != 1}">我要成为顾问</span>
         </div>
         <div class="adviserIndexList">
             <div class="listHead listOne">

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

@@ -3,7 +3,7 @@
 	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">

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/adviser/adviserList.html

@@ -2,7 +2,7 @@
 <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">

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/safeguarding.html

@@ -26,7 +26,7 @@
                     </span>
                 </div>
             </div>
-            <span>我要成为法律顾问</span>
+            <span th:if="${userType != 1}">我要成为法律顾问</span>
         </div>
         <div class="safeIndexPic">
             <img th:src="${portalHost+'/img/newMenu/safeIndex_1.png'}" alt="">