用户完善或修改个人信息时不能修改校区。只有后台修改用户或分配校区才可以变更

ie-admin/src/main/java/com/ruoyi/web/service/SysRegisterService.java

@@ -204,7 +204,11 @@ public class SysRegisterService
 
         LearnStudent upStudent = new LearnStudent();
         upStudent.setStudentId(upUser.getUserId());
-        upStudent.setClassId(NumberUtils.isPositive(upCard.getCampusClassId()) ? upCard.getCampusClassId() : upCard.getClassId());
+        if(NumberUtils.isPositive(upCard.getCampusClassId())) {
+            upStudent.setClassId(upCard.getCampusClassId());
+        } else if(null == card.getCampusClassId()) {
+            upStudent.setClassId(upCard.getClassId());
+        }
         upStudent.setSchoolId(upCard.getSchoolId());
         upStudent.setCampusId(upCard.getCampusId());
         learnStudentMapper.updateLearnStudent(upStudent);
@@ -216,6 +220,8 @@ public class SysRegisterService
     }
 
     private void saveInfo(SysUser user, DzCards card, RegisterBody register) {
+        register.setCampusSchoolId(null);
+        register.setCampusClassId(null);
         user.setNickName(register.getNickName());
         user.setLocation(register.getLocation());
         user.setExamType(register.getExamType());
@@ -264,7 +270,11 @@ public class SysRegisterService
             userService.insertUser(user);
             LearnStudent upStudent = new LearnStudent();
             upStudent.setStudentId(user.getUserId());
-            upStudent.setClassId(user.getClassId());
+            if(null == card || null == card.getCampusClassId()) {
+                upStudent.setClassId(user.getClassId());
+            } else {
+                upStudent.setClassId(card.getCampusClassId());
+            }
             upStudent.setSchoolId(user.getSchoolId());
             upStudent.setCampusId(register.getCampusSchoolId());
             learnStudentMapper.insertLearnStudent(upStudent);
@@ -272,10 +282,7 @@ public class SysRegisterService
             LearnStudent upStudent = new LearnStudent();
             upStudent.setStudentId(user.getUserId());
             upStudent.setSchoolId(user.getSchoolId());
-            if (NumberUtils.isPositive(register.getCampusClassId())) {
-                upStudent.setClassId(register.getCampusClassId());
-                upStudent.setCampusId(register.getCampusSchoolId());
-            } else {
+            if(null == card || null == card.getCampusClassId()) {
                 upStudent.setClassId(user.getClassId());
             }
             learnStudentMapper.updateLearnStudent(upStudent);