--no commit message

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/student/FgStudentServiceImpl.java

@@ -250,32 +250,12 @@ public class FgStudentServiceImpl extends BaseModelServiceImpl<Student,Integer>
 			Student stu = BeanUtils.copy(v, Student.class);
 			StringBuffer errMsg = new StringBuffer();
 			
-			
-			//验证培养层次是否存在
-			BasicTeachingPlan plan = fgBasicTeachingPlanManage.isExsitPlan(redis.getMember().getRelationId(), redis.getMember().getType(), v.getPlanName());
-			if(StringUtils.isNotEmpty(v.getPlanName())){
-				if(plan == null){
-					errMsg.append("培养层次不存在");
-				}else{
-					ClassManagement form = new ClassManagement();
-					form.setName(v.getClassName());
-					form.setBptId(plan.getId());
-					form.setRelationId(redis.getMember().getRelationId());
-					form.setType(redis.getMember().getType());
-					ClassManagement entity = fgClassManagementMapper.selectOne(form);
-					if(entity == null){
-						errMsg.append("  该培养层次下面不存在此班级");
-					}
-				}
-			}else{
-				errMsg.append("  培养层次名称不能为空");
-			}
-			
 			//验证学号
 			String msg = this.isExistID(stu);
+			errMsg.append(msg);
 			//验证身份证号码
 			String msg1 = this.isExistNumber(stu);
-			
+			errMsg.append(msg1);
 			
 			ClassManagement entity = new ClassManagement();
 			if(StringUtils.isNotEmpty(v.getClassName())){
@@ -295,6 +275,10 @@ public class FgStudentServiceImpl extends BaseModelServiceImpl<Student,Integer>
 				errMsg.append("  姓名不能为空");
 			}
 			
+			if(StringUtils.isEmpty(v.getSex())){
+				errMsg.append("  性别不能为空");
+			}
+			
 			String countMsg = errMsg.toString();
 			
 			
@@ -303,12 +287,11 @@ public class FgStudentServiceImpl extends BaseModelServiceImpl<Student,Integer>
 				list.add(vo);
 				continue;
 			}
-			if(plan != null){
-				stu.setDepartmentId(plan.getDepartmentId());
-				stu.setMajorId(plan.getMajorId());
-				stu.setBptId(plan.getId());
-				stu.setAcademicLevel(plan.getAcademicLevel());
-			}
+			
+			stu.setDepartmentId(entity.getDepartmentId());
+			stu.setMajorId(entity.getMajorId());
+			stu.setBptId(entity.getBptId());
+			stu.setAcademicLevel(entity.getAcademicLevel());
 			stu.setClassId(entity.getId());
 			stu.setSex(MemberSexEnum.getCode(v.getSex()));
 			stu.setRelationId(redis.getMember().getRelationId());