Merge remote-tracking branch 'origin/master'

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

@@ -382,6 +382,7 @@ public class StudentManageServiceImpl implements StudentManageService {
         sysUser.setImToken(register.getToken());
         teacherDao.updateUser(sysUser);
         sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
+        studentService.upSet(new Student(userId,sysUser.getOrganId().toString()));
         return userId;
     }
 

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

@@ -48,16 +48,12 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public Long upSet(Student student) {
-		if(student.getUserId() == null){
+		if(studentDao.get(student.getUserId()) == null){
 			return studentDao.insert(student);
 		}else {
-			if(studentDao.get(student.getUserId()) == null){
-				return studentDao.insert(student);
-			}else {
-				student.setUpdateTime(new Date());
-				studentDao.update(student);
-				return student.getUserId().longValue();
-			}
+			student.setUpdateTime(new Date());
+			studentDao.update(student);
+			return student.getUserId().longValue();
 		}
 	}
 }