|
|
@@ -469,8 +469,8 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
|
|
|
List<BaseStudentFamily> insertFamilyList = new ArrayList();
|
|
|
List<BaseStudentContact> insertContactList = new ArrayList();
|
|
|
|
|
|
-// long createUserId = StpUtil.getLoginIdAsLong();
|
|
|
- long createUserId = 1000000000000000000L;
|
|
|
+ long createUserId = StpUtil.getLoginIdAsLong();
|
|
|
+// long createUserId = 1000000000000000000L;
|
|
|
int row = 3;
|
|
|
for (Map<Integer, Object> dataMaps : excelDataList) {
|
|
|
if(dataMaps.get(0) == null){
|
|
|
@@ -832,7 +832,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
|
|
|
}else{
|
|
|
insertStudentUserList.add(user);
|
|
|
insertBaseStudentList.add(baseStudent);
|
|
|
- if(schoolRoll.getClassId() != null && schoolRoll.getGradeId() != null && schoolRoll.getMajorSetId() ==null){
|
|
|
+ if(schoolRoll.getClassId() != null && schoolRoll.getGradeId() != null && schoolRoll.getMajorSetId() != null){
|
|
|
insertSchoolRollList.add(schoolRoll);
|
|
|
}
|
|
|
insertSubsidizeList.add(subsidize);
|