1

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

@@ -50,9 +50,15 @@ public class UserController extends BaseController {
         if(StringUtils.isEmpty(phone) || clazzId == null){
             return failed(Constants.PARAM_VERIFY_ERROR_MSG);
         }
-        ApplyInfo userByPhone = applyInfoService.findUserByPhone(phone, clazzId);
+        ApplyInfo userByPhone = applyInfoService.findUserByPhone(phone, null);
+        if(userByPhone != null & userByPhone.getClassId()!=clazzId){//如果改用户存在其他团中
+        	return failed(Constants.PARAM_EXIST_ERROR_MSG);
+        }
+        userByPhone = applyInfoService.findUserByPhone(phone, clazzId);
         School school = schoolService.get(clazzId);
-        userByPhone.setPushStatus(school.getStatus());
+        if(userByPhone != null){
+        	userByPhone.setPushStatus(school.getStatus());
+        }
         return succeed(userByPhone);
     }
 

src/main/java/com/ym/mec/collectfee/utils/Constants.java

@@ -2,4 +2,5 @@ package com.ym.mec.collectfee.utils;
 
 public interface Constants {
     String PARAM_VERIFY_ERROR_MSG = "参数校验异常";
+    String PARAM_EXIST_ERROR_MSG = "该用户已在其他乐团报名";
 }