diff --git a/admin-core/src/main/resources/static/js/lib.js b/admin-core/src/main/resources/static/js/lib.js
index ca115e5e..9618e7c5 100644
--- a/admin-core/src/main/resources/static/js/lib.js
+++ b/admin-core/src/main/resources/static/js/lib.js
@@ -963,6 +963,17 @@ var Lib = {
         $(key).empty();
         $(key).append(htm);
         layui.form.render();
+    },getUniversitySystems:function (key, classId){ //获取专业
+        var ret = Common.getAjax("/jlw/universitySystem/getValues.json",{universityFacultyId: classId});
+        var htm = '<option value="">请选择</option>';
+        if(ret.code == 0){
+            for (var i = 0;i < ret.data.length;i++){
+                htm += '<option value="'+ret.data[i].universitySystemId+'">'+ret.data[i].universitySystemName+'</option>';
+            }
+        }
+        $(key).empty();
+        $(key).append(htm);
+        layui.form.render();
     },repLaceString:function (str){ //替换所有标签转义 <:&lt;  >:&gt;
         if(!$.isEmpty(str)){
             return str.replace(/</g,'&lt;').replace(/>/g,'&gt;');
diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java
index 6c7f1f5a..63fc50e0 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java
@@ -377,7 +377,8 @@ public class StudentService extends CoreBaseService<Student>{
     }
 
     public Boolean edit(Student student){
-
+        SchoolClass schoolClass = schoolClassService.queryById(student.getClassId());
+        student.setOrgId(schoolClass.getOrgId());
         this.updateTemplate(student);
         student = this.queryById(student.getStudentId());
         String code = student.createCode();//TODO 可改规则
diff --git a/web/src/main/java/com/ibeetl/jlw/web/StudentController.java b/web/src/main/java/com/ibeetl/jlw/web/StudentController.java
index 8b2abf4e..e804ee46 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/StudentController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/StudentController.java
@@ -1992,6 +1992,12 @@ public class StudentController{
         return view;
     }
 
+    /**
+     * 2022-09-20 许良彤
+     * @param studentId
+     * @param coreUser
+     * @return
+     */
     @GetMapping(MODEL + "/add.do")
     @Function("student.add")
     @ResponseBody
@@ -2535,14 +2541,14 @@ public class StudentController{
             //头部样式
             HSSFCellStyle headerStyle = workbook.createCellStyle();
             //垂直居中
-            headerStyle.setVerticalAlignment(headerStyle.getVerticalAlignmentEnum().CENTER);
+            headerStyle.setVerticalAlignment(VerticalAlignment.CENTER);
             //水平居中
             headerStyle.setAlignment(HorizontalAlignment.CENTER);
 
             //单元格样式
             HSSFCellStyle cellStyle = workbook.createCellStyle();
             //垂直居中
-            cellStyle.setVerticalAlignment(cellStyle.getVerticalAlignmentEnum().CENTER);
+            cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
             //水平居左
             cellStyle.setAlignment(HorizontalAlignment.CENTER);
             //自动换行
diff --git a/web/src/main/resources/static/js/jlw/student/add.js b/web/src/main/resources/static/js/jlw/student/add.js
index 311c87ab..06653699 100644
--- a/web/src/main/resources/static/js/jlw/student/add.js
+++ b/web/src/main/resources/static/js/jlw/student/add.js
@@ -58,6 +58,7 @@ layui.define([ 'form', 'laydate', 'table','studentApi'], function(exports) {
     //根据所选学校查询班级
     form.on('select(select_universitiesColleges)', function (obj) {
         Lib.getSchoolClass($("select[name='classId']"),obj.value);
+        Lib.getUniversitySystems($("select[name='universitySystemId']"),obj.value);
     });
     exports('add',view);
 });
\ No newline at end of file
diff --git a/web/src/main/resources/static/js/jlw/student/index.js b/web/src/main/resources/static/js/jlw/student/index.js
index f38aa08e..6ea6a322 100644
--- a/web/src/main/resources/static/js/jlw/student/index.js
+++ b/web/src/main/resources/static/js/jlw/student/index.js
@@ -29,11 +29,15 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
 
                 {
                     field : 'universitiesCollegesName',
-                        title : '所属院校',align: "center",hide:$("input[name='beTeacher']").val() != 1?false:true
+                        title : '所属院系',align: "center",hide:$("input[name='beTeacher']").val() != 1?false:true
                 },
                 {
                     field : 'classIdText',
-                        title : '班级名称',align: "center"
+                        title : '所属专业',align: "center"
+                },
+                {
+                    field : 'classIdText',
+                        title : '所属班级',align: "center"
                 },
                 {
 
@@ -43,17 +47,17 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                 {
 
                     field : 'studentSn', 
-                        title : '学生学号',align: "center"
+                        title : '学号',align: "center"
                 },
                 {
 
                     field : 'studentMobile', 
-                        title : '学生电话',align: "center"
+                        title : '电话',align: "center"
                 },
                 {
 
                     field : 'studentEmail', 
-                        title : '学生邮箱',align: "center"
+                        title : '邮箱',align: "center"
                 },
                 {
 
@@ -66,7 +70,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     title : '注册时间',align: "center"
                 },
                 {
-                    field : 'userId',title : '操作',align:"center", templet: function (d) {
+                    field : 'userId',title : '操作',align:"center",fixed: "right", width: 200, templet: function (d) {
                         var htm = '<button type="button" class="layui-btn layui-btn-xs" lay-event="edit">编辑</button></a>';
                         htm += '<button type="button" class="layui-btn layui-btn-xs" lay-event="del">删除</button></a>';
                         htm += '<button type="button" class="layui-btn layui-btn-xs" lay-event="password">初始化密码</button></a>';
diff --git a/web/src/main/resources/templates/jlw/student/add.html b/web/src/main/resources/templates/jlw/student/add.html
index 1cbfed93..0b407d56 100644
--- a/web/src/main/resources/templates/jlw/student/add.html
+++ b/web/src/main/resources/templates/jlw/student/add.html
@@ -23,9 +23,20 @@
             <div class="layui-inline">
                 <label class="layui-form-label"><span class="req">*</span>班级：</label>
                 <div class="layui-input-inline">
-                    <select name="classId">
-                        <option value="">请选择</option>
-                    </select>
+                    <layui:simpleDictSelect style='layui-input-inline' value="${student.classId}" type="school_class.class_name.class_status=1,universities_colleges_id=${universitiesCollegesId}"
+                                            id="classId" name="classId"/>
+                </div>
+            </div>
+            <button type="button" class="layui-btn layui-btn-sm rightOffClassAdd bg_button">去添加</button>
+        </div>
+    </div>
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label"><span class="req">*</span>专业：</label>
+                <div class="layui-input-inline">
+                    <layui:simpleDictSelect style='layui-input-inline' value="${student.classId}" type="university_system.university_system_name.university_system_status=1,university_faculty_id=${universitiesCollegesId}"
+                                            id="universitySystemId" name="universitySystemId"/>
                 </div>
             </div>
             <button type="button" class="layui-btn layui-btn-sm rightOffClassAdd bg_button">去添加</button>