diff --git a/element-vue/src/components/timeSelect.vue b/element-vue/src/components/timeSelect.vue
index f9fb137..795c571 100644
--- a/element-vue/src/components/timeSelect.vue
+++ b/element-vue/src/components/timeSelect.vue
@@ -2,28 +2,30 @@
     <div>
         <el-row>
             <el-col :span="6" :offset="6">
-                学年：<el-select v-model="year" size="small" >
-                <el-option
-                        v-for="item in selectOptions1"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                        @click.native="selectYear"
-                >
-                </el-option>
-            </el-select>
+                学年：
+                <el-select v-model="year" size="small">
+                    <el-option
+                            v-for="item in selectOptions1"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                            @click.native="selectYear"
+                    >
+                    </el-option>
+                </el-select>
             </el-col>
             <el-col :span="6">
-                学期：<el-select v-model="semester" size="small" >
-                <el-option
-                        v-for="item in selectOptions2"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                        @click.native="selectSemester"
-                >
-                </el-option>
-            </el-select>
+                学期：
+                <el-select v-model="semester" size="small">
+                    <el-option
+                            v-for="item in selectOptions2"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                            @click.native="selectSemester"
+                    >
+                    </el-option>
+                </el-select>
             </el-col>
         </el-row>
         <br><br>
@@ -33,48 +35,45 @@
 <script>
     export default {
         name: "timeSelect",
-        data(){
-            return{
-                year:'1920',
-                semester:'2',
-                selectOptions1:[
+        data() {
+            return {
+                year: '2019',
+                semester: 2,
+                selectOptions1: [
                     {
-                        value:'1718',
-                        label:'2017-2018年'
+                        value: '2017',
+                        label: '2017-2018年'
                     },
                     {
-                        value:'1819',
-                        label:'2018-2019年'
+                        value: '2018',
+                        label: '2018-2019年'
                     },
                     {
-                        value:'1920',
-                        label:'2019-2020年'
+                        value: '2019',
+                        label: '2019-2020年'
                     }
                 ],
-                selectOptions2:[
+                selectOptions2: [
                     {
-                        value:'1',
-                        label:'第一学期'
+                        value: 1,
+                        label: '第一学期'
                     },
                     {
-                        value:'2',
-                        label:'第二学期'
+                        value: 2,
+                        label: '第二学期'
                     }
                 ],
             }
         },
-        methods:{
-            selectYear(){
+        methods: {
+            selectYear() {
                 this.$emit('selectYear')
             },
-            selectSemester(){
+            selectSemester() {
                 this.$emit('semester')
-            }
-        },
-        mounted() {
-            console.log(this.year)
+            },
+        }
         }
-    }
 </script>
 
 <style scoped>
diff --git a/element-vue/src/pages/teacher/courseManagement.vue b/element-vue/src/pages/teacher/courseManagement.vue
index d6e6876..44f0bb4 100644
--- a/element-vue/src/pages/teacher/courseManagement.vue
+++ b/element-vue/src/pages/teacher/courseManagement.vue
@@ -17,7 +17,7 @@
         </div>
         <el-table :data="tableDataComputed" border>
             <el-table-column type="selection" width="55"></el-table-column>
-            <el-table-column label="课程编号" prop="uc_id"></el-table-column>
+            <el-table-column label="课程编号" prop="ucId"></el-table-column>
             <el-table-column label="课程名称" prop="name"></el-table-column>
             <el-table-column label="软件名称" prop="software"></el-table-column>
             <el-table-column label="授课班级" prop="classes"></el-table-column>
@@ -135,25 +135,25 @@
                 },
                 selectOptions1: [
                     {
-                        value: '1718',
+                        value: '2017',
                         label: '2017-2018年'
                     },
                     {
-                        value: '1819',
+                        value: '2018',
                         label: '2018-2019年'
                     },
                     {
-                        value: '1920',
+                        value: '2019',
                         label: '2019-2020年'
                     }
                 ],
                 selectOptions2: [
                     {
-                        value: '1',
+                        value: 1,
                         label: '第一学期'
                     },
                     {
-                        value: '2',
+                        value: 2,
                         label: '第二学期'
                     }
                 ],
@@ -162,7 +162,7 @@
         methods: {
             //加载表格数据
             async load() {
-                this.tableData = await get('lb/course/courseManagement')
+                this.tableData = await get('lb/usercourse/findbyyearandsemester/'+this.$refs.timeSelect.year+'/'+this.$refs.timeSelect.semester)
             },
             selectYear(){
                 this.tableData = get('lb/course/selectYear',this.$refs.timeSelect.year)
@@ -184,11 +184,9 @@
                 this.courseForm = rowData
             },
             //删除课程
-            deleteCourse(rowData) {
-                showDialog("确认要删除吗？", this)
-                post('lb/user/deleteCourse', {
-                    uid: rowData.uc_id
-                }).then(() => {
+            async deleteCourse(rowData) {
+                await showDialog("确认要删除吗？", this)
+                post('lb/usercourse/deleteusercourse/'+rowData.ucId).then(() => {
                     showSuccess("删除成功", this)
                     this.load()
                 }).catch(e => {
@@ -204,14 +202,14 @@
                         await showDialog("确定要" + (this.edit ? '编辑' : '新增') + '吗？', this)
                         //编辑提交
                         if (this.edit) {
-                            await post('lb/usercourse/updatecourse', {
+                            await post('lb/usercourse/updateusercourse', {
                                 year: this.courseForm.year,
                                 semester: this.courseForm.semester,
-                                uc_id: this.courseForm.uc_id,
+                                ucId: this.courseForm.ucId,
                                 name: this.courseForm.name,
                                 software: this.courseForm.software,
                                 classes: this.courseForm.classes,
-                                population: this.courseForm.population,
+                                population: parseInt(this.courseForm.population),
                                 remind: this.courseForm.remind,
                                 isHaveDocuments: this.courseForm.isHaveDocuments
                             }).catch(async e => {
@@ -230,7 +228,7 @@
                                 name: this.courseForm.name,
                                 software: this.courseForm.software,
                                 classes: this.courseForm.classes,
-                                population: this.courseForm.population,
+                                population:  parseInt(this.courseForm.population),
                                 remind: this.courseForm.remind,
                                 isHaveDocuments: this.courseForm.isHaveDocuments
                             }).catch(async e => {
@@ -255,14 +253,9 @@
         computed: {
             tableDataComputed() {
                 return this.tableData.filter(data => !this.search
-                    || data.uc_id.toLowerCase().includes(this.search.toLowerCase())
-                    || data.u_id.toLowerCase().includes(this.search.toLowerCase())
                     || data.name.toLowerCase().includes(this.search.toLowerCase())
                     || data.software.toLowerCase().includes(this.search.toLowerCase())
                     || data.classes.toLowerCase().includes(this.search.toLowerCase())
-                    || data.population.toLowerCase().includes(this.search.toLowerCase())
-                    || data.remind.toLowerCase().includes(this.search.toLowerCase())
-                    || data.isHaveDocuments.toLowerCase().includes(this.search.toLowerCase())
                 )
             }
         },
diff --git a/java/src/main/java/com/hzu/bookingsystem/controller/UserCourseController.java b/java/src/main/java/com/hzu/bookingsystem/controller/UserCourseController.java
index ffe608a..a0099f1 100644
--- a/java/src/main/java/com/hzu/bookingsystem/controller/UserCourseController.java
+++ b/java/src/main/java/com/hzu/bookingsystem/controller/UserCourseController.java
@@ -18,6 +18,9 @@ public class UserCourseController {
     @Autowired
     private UserCourseService usercourseService;
 
+    @Autowired
+    private UserController userController;
+
     // 根据id查看课程记录
     @GetMapping(value = "/findusercourse/{uc_id}")
     public ResultVO<Map<String, UserCourseBean>> FindUserCourseId(@PathVariable("uc_id") Integer uc_id) {
@@ -39,13 +42,26 @@ public class UserCourseController {
         return ResultVOUtil.success(usercourselist);
     }
 
+    // author 吴志岳
+    // 根据用户登录id和学年，学期查询课程
+    @GetMapping(value = "/findbyyearandsemester/{year}/{semester}")
+    public ResultVO<Map<String, UserCourseBean>> findUidandYearandSemester(@PathVariable("year") String year,@PathVariable("semester") Integer semester,HttpServletRequest request) {
+        List<UserCourseBean> usercourselist = usercourseService.findAllByUidAndYearAndSemester(userController.getUIdByCookie(request),year,semester) ;
+        return ResultVOUtil.success(usercourselist);
+    }
+
 
     // 增加课程记录
     @PostMapping(value = "/addusercourse", consumes = "application/json")
-    public ResultVO addUserCourse(@RequestBody Map<String,Object> map) {
+    public ResultVO addUserCourse(@RequestBody Map<String,Object> map,HttpServletRequest request) {
         // 1.转换对象
         UserCourseBean usercourse = (UserCourseBean) Map2Object.map2Object(map,UserCourseBean.class);
-        // 2.插入
+
+        // author 吴志岳
+        // 2.设置用户ID
+        usercourse.setUId(userController.getUIdByCookie(request));
+
+        // 3.插入
         usercourseService.add(usercourse);
         return ResultVOUtil.success();
     }
@@ -56,12 +72,16 @@ public class UserCourseController {
         // 转换对象
         UserCourseBean usercourse = (UserCourseBean) Map2Object.map2Object(map,UserCourseBean.class);
 
+        // author 吴志岳
+        // 2.设置用户ID
+        usercourse.setUId(userController.getUIdByCookie(request));
+
         UserCourseBean usercoursenew = usercourseService.update(usercourse) ;
         return ResultVOUtil.success(usercoursenew);
     }
 
     // 通过uc_id删除记录
-    @PostMapping(value = "/deleteusercourse/{uc_id}", consumes = "application/json")
+    @PostMapping(value = "/deleteusercourse/{uc_id}")
     public ResultVO deleteUsercourse(@PathVariable("uc_id") Integer uc_id){
         // 查找该用户看是否存在
         UserCourseBean usercourse = usercourseService.findById(uc_id);