Merge remote-tracking branch 'origin/master'

src/main/java/com/ym/mec/collectfee/controller/UserController.java

@@ -47,10 +47,12 @@ public class UserController extends BaseController {
         if(StringUtils.isEmpty(phone) || clazzId == null || cityId == null){
             return failed(Constants.PARAM_VERIFY_ERROR_MSG);
         }
-        if(applyInfoService.mecUserIsExist(phone)){
+        
+        ApplyInfo userByPhone = applyInfoService.findUserByPhone(phone, null);
+        
+        if(userByPhone == null && applyInfoService.mecUserIsExist(phone)){
             return failed(Constants.PARAM_EXIST_ERROR_MSG);
         }
-        ApplyInfo userByPhone = applyInfoService.findUserByPhone(phone, null);
         if(userByPhone != null && !userByPhone.getClassId().equals(clazzId)){//如果改用户存在其他团中
         	return failed(Constants.PARAM_EXIST_ERROR_MSG);
         }