feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
-	<version>1.0.45</version>
+	<version>1.0.46</version>
 	<name>xiangsong</name>
 	<description>香颂</description>
 

src/main/java/com/huiju/estateagents/common/smsService/Captcha.java

@@ -84,16 +84,16 @@ public class Captcha {
      * @return
      */
     public boolean validate(String tel, String captcha) {
-        Phone phone = fromCache(tel);
-        if (null == phone) {
-            return false;
-        }
-
         String universalCode = getUniversalCode();
         if (universalCode.equals(captcha)) {
             return true;
         }
 
+        Phone phone = fromCache(tel);
+        if (null == phone) {
+            return false;
+        }
+
         if (null == captcha || !captcha.equals(phone.getCaptcha())) {
             return false;
         }

src/main/java/com/huiju/estateagents/property/service/impl/TaUserVerifyServiceImpl.java

@@ -111,7 +111,10 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         userVerify.setVerifyStatus(status);
 
         // 校验房产
-        hasUserVerify(userElement, userVerify, true);
+//        hasUserVerify(userElement, userVerify, true);
+        // 2020年12月31日 yansen
+        hasUserVerify(userElement, userVerify, Integer.valueOf(1).equals(userVerify.getRoleId()));
+
 
         TaUser user = taUserMapper.selectById(userElement.getUserId());
 
@@ -248,7 +251,9 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         userVerify.setVerifyStatus(verifyStatus);
 
         //判断审核数据是否冲突
-        hasUserVerify(userElement,  userVerify,  true);
+//        hasUserVerify(userElement,  userVerify,  true);
+        // 2020年12月31日 yansen
+        hasUserVerify(userElement,  userVerify,  Integer.valueOf(1).equals(userVerify.getRoleId()));
 
         // 被审核的用户
         TaPerson taPerson = taPersonMapper.selectById(userVerify.getPersonId());