fixed the user page and add userName

back-ui/src/views/system/user/index.vue

@@ -134,17 +134,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+            <el-form-item label="用户名称" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
               <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />

ie-admin/src/main/java/com/ruoyi/web/controller/dz/DzClassesController.java

@@ -167,18 +167,18 @@ public class DzClassesController extends BaseController
                 }
             }
             //把创建的默认旧班级删除
-            if (null!=dzClasses.getSchoolId()){
-                DzClasses query = new DzClasses();
-                query.setIsDefault(BoolValues.yes.getValue());
-                query.setSchoolId(dzClasses.getSchoolId());
-                List<DzClasses> dzClassesList = dzClassesService.selectDzClassesList(query);
-                if (CollectionUtil.isNotEmpty(dzClassesList)) {
-                    Long[] classesIds = dzClassesList.stream().map(DzClasses::getClassId).filter(id -> id != null).toArray(Long[]::new);
-                    if (null!=classesIds&&classesIds.length>0){
-                        dzClassesService.deleteDzClassesByClassIds(classesIds);
-                    }
-                }
-            }
+//            if (null!=dzClasses.getSchoolId()){
+//                DzClasses query = new DzClasses();
+//                query.setIsDefault(BoolValues.yes.getValue());
+//                query.setSchoolId(dzClasses.getSchoolId());
+//                List<DzClasses> dzClassesList = dzClassesService.selectDzClassesList(query);
+//                if (CollectionUtil.isNotEmpty(dzClassesList)) {
+//                    Long[] classesIds = dzClassesList.stream().map(DzClasses::getClassId).filter(id -> id != null).toArray(Long[]::new);
+//                    if (null!=classesIds&&classesIds.length>0){
+//                        dzClassesService.deleteDzClassesByClassIds(classesIds);
+//                    }
+//                }
+//            }
         }
         return toAjax(1);
     }
@@ -216,8 +216,8 @@ public class DzClassesController extends BaseController
      * 校验班级名称在同一学校下是否唯一
      */
     @GetMapping("/checkClassName")
-    public AjaxResult checkClassName(@RequestParam("schoolId") Long schoolId, 
-                                     @RequestParam("name") String name, 
+    public AjaxResult checkClassName(@RequestParam("schoolId") Long schoolId,
+                                     @RequestParam("name") String name,
                                      @RequestParam(value = "classId", required = false) Long classId)
     {
         boolean isUnique = dzClassesService.checkClassName(schoolId, name, classId);