update

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServiceImpl.java

@@ -149,7 +149,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         		throw new BizException("您已注册，请直接下载APP！");
         	}
         	userId = user.getId();
-
+        	user.setOrganId(studentPreRegistration.getOrganId());
             user.setUpdateTime(date);
             teacherDao.updateUser(user);
         }else{
@@ -498,7 +498,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             student.setMembershipStartTime(nowDate);
         }
         
-        if(student.getMembershipEndTime().after(nowDate)){
+        if(student.getMembershipEndTime() != null && student.getMembershipEndTime().after(nowDate)){
         	nowDate = student.getMembershipEndTime();
         }
         

mec-student/src/main/java/com/ym/mec/student/controller/StudentController.java

@@ -16,7 +16,6 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.StudentPreRegistration;
 import com.ym.mec.biz.service.StudentService;
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.exception.BizException;
 
 @RequestMapping("student")
 @Api(tags = "学生服务")