소스 검색

解决新生导入无法查询出来的问题

dzx 1 년 전
부모
커밋
3d2a0f3eff
1개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 3
      src/main/java/com/xjrsoft/module/student/service/impl/StudentManagerServiceImpl.java

+ 3 - 3
src/main/java/com/xjrsoft/module/student/service/impl/StudentManagerServiceImpl.java

@@ -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);