瀏覽代碼

修改提交

liql 3 年之前
父節點
當前提交
2330907a9e

+ 1 - 10
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -16,15 +16,6 @@ public class RuoYiApplication
     {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
-        System.out.println("(♥◠‿◠)ノ゙  贵州省林业学校新生信息管理系统启动成功   ლ(´ڡ`ლ)゙  \n" +
-                " .-------.       ____     __        \n" +
-                " |  _ _   \\      \\   \\   /  /    \n" +
-                " | ( ' )  |       \\  _. /  '       \n" +
-                " |(_ o _) /        _( )_ .'         \n" +
-                " | (_,_).' __  ___(_ o _)'          \n" +
-                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-                " |  | \\ `'   /|   `-'  /           \n" +
-                " |  |  \\    /  \\      /           \n" +
-                " ''-'   `'-'    `-..-'              ");
+        System.out.println("(♥◠‿◠)ノ゙  贵州省林业学校新生信息管理系统启动成功   ლ(´ڡ`ლ)゙");
     }
 }

+ 8 - 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuBookApplyController.java

@@ -50,7 +50,7 @@ public class StuBookApplyController extends BaseController
     /**
      * 查询教材申请列表
      */
-    @PreAuthorize("@ss.hasPermi('apply:book:list')")
+    //@PreAuthorize("@ss.hasPermi('apply:book:list')")
     @GetMapping("/list")
     @ApiOperation("教材申请审批列表接口")
     public TableDataInfo list(ApplyListParam param)
@@ -63,7 +63,7 @@ public class StuBookApplyController extends BaseController
     /**
      * 我的教材申请列表
      */
-    @PreAuthorize("@ss.hasPermi('apply:book:myList')")
+    //@PreAuthorize("@ss.hasPermi('apply:book:myList')")
     @GetMapping("/myList")
     @ApiOperation("我的教材申请列表接口")
     public TableDataInfo myList(ApplyListParam param)
@@ -79,7 +79,7 @@ public class StuBookApplyController extends BaseController
     /**
      * 获取教材申请详细信息
      */
-    @PreAuthorize("@ss.hasPermi('department:apply:query')")
+   //@PreAuthorize("@ss.hasPermi('department:apply:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -89,7 +89,7 @@ public class StuBookApplyController extends BaseController
     /**
      * 新增教材申请
      */
-    @PreAuthorize("@ss.hasPermi('apply:book:add')")
+    //@PreAuthorize("@ss.hasPermi('apply:book:add')")
     @Log(title = "教材申请", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation("新增发放教材申请")
@@ -101,7 +101,7 @@ public class StuBookApplyController extends BaseController
     /**
      * 修改教材申请
      */
-    @PreAuthorize("@ss.hasPermi('apply:book:edit')")
+    //@PreAuthorize("@ss.hasPermi('apply:book:edit')")
     @Log(title = "教材申请", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody StuBookApply stuBookApply)
@@ -112,7 +112,7 @@ public class StuBookApplyController extends BaseController
     /**
      * 删除教材申请
      */
-    @PreAuthorize("@ss.hasPermi('apply:book:remove')")
+    //@PreAuthorize("@ss.hasPermi('apply:book:remove')")
     @Log(title = "教材申请", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     @ApiOperation(value = "删除")
@@ -124,7 +124,7 @@ public class StuBookApplyController extends BaseController
     /**
      * 发放教材审核
      */
-    @PreAuthorize("@ss.hasPermi('apply:book:approval')")
+    //@PreAuthorize("@ss.hasPermi('apply:book:approval')")
     @Log(title = "教材申请", businessType = BusinessType.UPDATE)
     @PutMapping("/approval")
     @ApiOperation(value = "审批")
@@ -144,7 +144,7 @@ public class StuBookApplyController extends BaseController
     /**
      * 教材发放
      */
-    @PreAuthorize("@ss.hasPermi('apply:book:grant')")
+    //@PreAuthorize("@ss.hasPermi('apply:book:grant')")
     @Log(title = "教材申请", businessType = BusinessType.UPDATE)
     @PutMapping("/grant")
     @ApiOperation(value = "发放")

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuBuildingController.java

@@ -61,7 +61,7 @@ public class StuBuildingController extends BaseController
     /**
      * 获取楼宇详细信息
      */
-    @PreAuthorize("@ss.hasPermi('dorm:building:query')")
+    //@PreAuthorize("@ss.hasPermi('dorm:building:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +71,7 @@ public class StuBuildingController extends BaseController
     /**
      * 新增楼宇
      */
-    @PreAuthorize("@ss.hasPermi('dorm:building:add')")
+    //@PreAuthorize("@ss.hasPermi('dorm:building:add')")
     @Log(title = "楼宇", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody StuBuilding stuBuilding)
@@ -82,7 +82,7 @@ public class StuBuildingController extends BaseController
     /**
      * 修改楼宇
      */
-    @PreAuthorize("@ss.hasPermi('dorm:building:edit')")
+    //@PreAuthorize("@ss.hasPermi('dorm:building:edit')")
     @Log(title = "楼宇", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody StuBuilding stuBuilding)
@@ -93,7 +93,7 @@ public class StuBuildingController extends BaseController
     /**
      * 删除楼宇
      */
-    @PreAuthorize("@ss.hasPermi('dorm:building:remove')")
+    //@PreAuthorize("@ss.hasPermi('dorm:building:remove')")
     @Log(title = "楼宇", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

+ 6 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuClassBookConfigController.java

@@ -43,7 +43,7 @@ public class StuClassBookConfigController extends BaseController
     /**
      * 查询教材配置列表
      */
-    @PreAuthorize("@ss.hasPermi('book:config:list')")
+    //@PreAuthorize("@ss.hasPermi('book:config:list')")
     @GetMapping("/list")
     @ApiOperation(value = "根据班级id获取教材配置列表接口")
     public AjaxResult list(Long classId)
@@ -56,7 +56,7 @@ public class StuClassBookConfigController extends BaseController
     /**
      * 获取教材配置详细信息
      */
-    @PreAuthorize("@ss.hasPermi('book:config:query')")
+    //@PreAuthorize("@ss.hasPermi('book:config:query')")
     @GetMapping(value = "/{classId}")
     public AjaxResult getInfo(@PathVariable("classId") Long classId)
     {
@@ -66,7 +66,7 @@ public class StuClassBookConfigController extends BaseController
     /**
      * 新增教材配置
      */
-    @PreAuthorize("@ss.hasPermi('book:config:add')")
+    //@PreAuthorize("@ss.hasPermi('book:config:add')")
     @Log(title = "教材配置", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "添加班级教材配置")
@@ -78,7 +78,7 @@ public class StuClassBookConfigController extends BaseController
     /**
      * 修改教材配置
      */
-    @PreAuthorize("@ss.hasPermi('book:config:edit')")
+    //@PreAuthorize("@ss.hasPermi('book:config:edit')")
     @Log(title = "教材配置", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody StuClassBookConfig stuClassBookConfig)
@@ -89,7 +89,7 @@ public class StuClassBookConfigController extends BaseController
     /**
      * 删除教材配置
      */
-    @PreAuthorize("@ss.hasPermi('book:config:remove')")
+    //@PreAuthorize("@ss.hasPermi('book:config:remove')")
     @Log(title = "教材配置", businessType = BusinessType.DELETE)
 	@DeleteMapping("/batchRemove")
     @ApiOperation(value = "批量删除班级教材配置")
@@ -102,7 +102,7 @@ public class StuClassBookConfigController extends BaseController
     /**
      * 删除教材配置
      */
-    @PreAuthorize("@ss.hasPermi('book:config:remove')")
+    //@PreAuthorize("@ss.hasPermi('book:config:remove')")
     @Log(title = "教材配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/singleRemove")
     @ApiOperation(value = "单个删除班级教材配置")

+ 6 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuClassController.java

@@ -53,7 +53,7 @@ public class StuClassController extends BaseController
     /**
      * 导出班级列表
      */
-    @PreAuthorize("@ss.hasPermi('department:classes:export')")
+    //@PreAuthorize("@ss.hasPermi('department:classes:export')")
     @Log(title = "班级", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(StuClass stuClass)
@@ -66,7 +66,7 @@ public class StuClassController extends BaseController
     /**
      * 获取班级详细信息
      */
-    @PreAuthorize("@ss.hasPermi('department:classes:query')")
+    //@PreAuthorize("@ss.hasPermi('department:classes:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -76,7 +76,7 @@ public class StuClassController extends BaseController
     /**
      * 新增班级
      */
-    @PreAuthorize("@ss.hasPermi('department:classes:add')")
+    //@PreAuthorize("@ss.hasPermi('department:classes:add')")
     @Log(title = "班级", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody StuClass stuClass)
@@ -87,7 +87,7 @@ public class StuClassController extends BaseController
     /**
      * 修改班级
      */
-    @PreAuthorize("@ss.hasPermi('department:classes:edit')")
+    //@PreAuthorize("@ss.hasPermi('department:classes:edit')")
     @Log(title = "班级", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody StuClass stuClass)
@@ -98,7 +98,7 @@ public class StuClassController extends BaseController
     /**
      * 删除班级
      */
-    @PreAuthorize("@ss.hasPermi('department:classes:remove')")
+    //@PreAuthorize("@ss.hasPermi('department:classes:remove')")
     @Log(title = "班级", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -109,7 +109,7 @@ public class StuClassController extends BaseController
     /**
      * 获取专业列表
      */
-    @PreAuthorize("@ss.hasPermi('department:classes:query')")
+    //@PreAuthorize("@ss.hasPermi('department:classes:query')")
     @GetMapping(value = "/query-list/{professionId}")
     @ApiOperation("根据专业id获取班级列表")
     public TableDataInfo getList(@PathVariable("professionId") Long professionId)

+ 8 - 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuOutSchoolApplyController.java

@@ -46,7 +46,7 @@ public class StuOutSchoolApplyController extends BaseController
     /**
      * 查询失学申请列表
      */
-    @PreAuthorize("@ss.hasPermi('apply:out:list')")
+    //@PreAuthorize("@ss.hasPermi('apply:out:list')")
     @GetMapping("/list")
     @ApiOperation("失学申请审批列表接口")
     public TableDataInfo list(ApplyListParam param)
@@ -59,7 +59,7 @@ public class StuOutSchoolApplyController extends BaseController
     /**
      * 我的失学申请列表
      */
-    @PreAuthorize("@ss.hasPermi('apply:out:mylist')")
+    //@PreAuthorize("@ss.hasPermi('apply:out:mylist')")
     @GetMapping("/myList")
     @ApiOperation("我的失学申请列表接口")
     public TableDataInfo myList(ApplyListParam param)
@@ -75,7 +75,7 @@ public class StuOutSchoolApplyController extends BaseController
     /**
      * 获取失学申请详细信息
      */
-    @PreAuthorize("@ss.hasPermi('apply:out:query')")
+    //@PreAuthorize("@ss.hasPermi('apply:out:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -85,7 +85,7 @@ public class StuOutSchoolApplyController extends BaseController
     /**
      * 新增失学申请
      */
-    @PreAuthorize("@ss.hasPermi('apply:out:add')")
+    //@PreAuthorize("@ss.hasPermi('apply:out:add')")
     @Log(title = "失学申请", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation("新增失学申请接口")
@@ -97,7 +97,7 @@ public class StuOutSchoolApplyController extends BaseController
     /**
      * 修改失学申请
      */
-    @PreAuthorize("@ss.hasPermi('apply:out:edit')")
+    //@PreAuthorize("@ss.hasPermi('apply:out:edit')")
     @Log(title = "失学申请", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody StuOutSchoolApply stuOutSchoolApply)
@@ -108,7 +108,7 @@ public class StuOutSchoolApplyController extends BaseController
     /**
      * 删除失学申请
      */
-    @PreAuthorize("@ss.hasPermi('apply:out:remove')")
+    //@PreAuthorize("@ss.hasPermi('apply:out:remove')")
     @Log(title = "失学申请", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -120,7 +120,7 @@ public class StuOutSchoolApplyController extends BaseController
     /**
      * 失学审批
      */
-    @PreAuthorize("@ss.hasPermi('apply:out:approval')")
+    //@PreAuthorize("@ss.hasPermi('apply:out:approval')")
     @Log(title = "失学申请", businessType = BusinessType.UPDATE)
     @PutMapping("/approval")
     @ApiOperation(value = "失学审批")
@@ -140,7 +140,7 @@ public class StuOutSchoolApplyController extends BaseController
     /**
      * 发放教材
      */
-    @PreAuthorize("@ss.hasPermi('apply:out:finish')")
+    //@PreAuthorize("@ss.hasPermi('apply:out:finish')")
     @Log(title = "失学申请", businessType = BusinessType.UPDATE)
     @PutMapping("/finish")
     @ApiOperation(value = "完成失学")

+ 9 - 9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuProfessionController.java

@@ -53,7 +53,7 @@ public class StuProfessionController extends BaseController
     /**
      * 导出专业列表
      */
-    @PreAuthorize("@ss.hasPermi('department:profession:export')")
+    //@PreAuthorize("@ss.hasPermi('department:profession:export')")
     @Log(title = "专业", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(StuProfession stuProfession)
@@ -66,7 +66,7 @@ public class StuProfessionController extends BaseController
     /**
      * 获取专业详细信息
      */
-    @PreAuthorize("@ss.hasPermi('department:profession:query')")
+    //@PreAuthorize("@ss.hasPermi('department:profession:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -76,7 +76,7 @@ public class StuProfessionController extends BaseController
     /**
      * 新增专业
      */
-    @PreAuthorize("@ss.hasPermi('department:profession:add')")
+    //@PreAuthorize("@ss.hasPermi('department:profession:add')")
     @Log(title = "专业", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody StuProfession stuProfession)
@@ -87,7 +87,7 @@ public class StuProfessionController extends BaseController
     /**
      * 修改专业
      */
-    @PreAuthorize("@ss.hasPermi('department:profession:edit')")
+    //@PreAuthorize("@ss.hasPermi('department:profession:edit')")
     @Log(title = "专业", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody StuProfession stuProfession)
@@ -98,7 +98,7 @@ public class StuProfessionController extends BaseController
     /**
      * 删除专业
      */
-    @PreAuthorize("@ss.hasPermi('department:profession:remove')")
+    //@PreAuthorize("@ss.hasPermi('department:profession:remove')")
     @Log(title = "专业", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -109,11 +109,11 @@ public class StuProfessionController extends BaseController
     /**
      * 获取专业列表
      */
-    @PreAuthorize("@ss.hasPermi('department:profession:query')")
-    @GetMapping(value = "/query-list/{departmentId}")
+    //@PreAuthorize("@ss.hasPermi('department:profession:query')")
+    @GetMapping(value = "/query-list")
     @ApiOperation("根据科系id获取专业列表")
-    public TableDataInfo getList(@PathVariable("departmentId") Long departmentId)
+    public TableDataInfo getList()
     {
-        return getDataTable(stuProfessionService.queryList(departmentId));
+        return getDataTable(stuProfessionService.queryList());
     }
 }

+ 8 - 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuQuitSchoolApplyController.java

@@ -46,7 +46,7 @@ public class StuQuitSchoolApplyController extends BaseController
     /**
      * 查询退学申请列表
      */
-    @PreAuthorize("@ss.hasPermi('apply:quit:list')")
+    //@PreAuthorize("@ss.hasPermi('apply:quit:list')")
     @GetMapping("/list")
     @ApiOperation("退学申请审批列表接口")
     public TableDataInfo list(ApplyListParam param)
@@ -59,7 +59,7 @@ public class StuQuitSchoolApplyController extends BaseController
     /**
      * 查询退学申请列表
      */
-    @PreAuthorize("@ss.hasPermi('apply:quit:mylist')")
+    //@PreAuthorize("@ss.hasPermi('apply:quit:mylist')")
     @GetMapping("/myList")
     @ApiOperation("我的退学申请列表接口")
     public TableDataInfo myList(ApplyListParam param)
@@ -75,7 +75,7 @@ public class StuQuitSchoolApplyController extends BaseController
     /**
      * 获取退学申请详细信息
      */
-    @PreAuthorize("@ss.hasPermi('apply:quit:query')")
+    //@PreAuthorize("@ss.hasPermi('apply:quit:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -85,7 +85,7 @@ public class StuQuitSchoolApplyController extends BaseController
     /**
      * 新增退学申请
      */
-    @PreAuthorize("@ss.hasPermi('apply:quit:add')")
+    //@PreAuthorize("@ss.hasPermi('apply:quit:add')")
     @Log(title = "退学申请", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation("新增退学申请接口")
@@ -97,7 +97,7 @@ public class StuQuitSchoolApplyController extends BaseController
     /**
      * 修改退学申请
      */
-    @PreAuthorize("@ss.hasPermi('apply:quit:edit')")
+    //@PreAuthorize("@ss.hasPermi('apply:quit:edit')")
     @Log(title = "退学申请", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody StuQuitSchoolApply stuQuitSchoolApply)
@@ -108,7 +108,7 @@ public class StuQuitSchoolApplyController extends BaseController
     /**
      * 删除退学申请
      */
-    @PreAuthorize("@ss.hasPermi('apply:quit:remove')")
+    //@PreAuthorize("@ss.hasPermi('apply:quit:remove')")
     @Log(title = "退学申请", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -119,7 +119,7 @@ public class StuQuitSchoolApplyController extends BaseController
     /**
      * 退学审批
      */
-    @PreAuthorize("@ss.hasPermi('apply:quit:approval')")
+    //@PreAuthorize("@ss.hasPermi('apply:quit:approval')")
     @Log(title = "退学申请", businessType = BusinessType.UPDATE)
     @PutMapping("/approval")
     @ApiOperation(value = "退学审批")
@@ -139,7 +139,7 @@ public class StuQuitSchoolApplyController extends BaseController
     /**
      * 完成退学
      */
-    @PreAuthorize("@ss.hasPermi('apply:quit:finish')")
+    //@PreAuthorize("@ss.hasPermi('apply:quit:finish')")
     @Log(title = "退学申请", businessType = BusinessType.UPDATE)
     @PutMapping("/finish")
     @ApiOperation(value = "完成退学")

+ 6 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuRoomController.java

@@ -52,7 +52,7 @@ public class StuRoomController extends BaseController
     /**
      * 导出寝室列表
      */
-    @PreAuthorize("@ss.hasPermi('dorm:room:export')")
+    //@PreAuthorize("@ss.hasPermi('dorm:room:export')")
     @Log(title = "寝室", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(StuRoom stuRoom)
@@ -65,7 +65,7 @@ public class StuRoomController extends BaseController
     /**
      * 获取寝室详细信息
      */
-    @PreAuthorize("@ss.hasPermi('dorm:room:query')")
+    //@PreAuthorize("@ss.hasPermi('dorm:room:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -75,7 +75,7 @@ public class StuRoomController extends BaseController
     /**
      * 新增寝室
      */
-    @PreAuthorize("@ss.hasPermi('dorm:room:add')")
+    //@PreAuthorize("@ss.hasPermi('dorm:room:add')")
     @Log(title = "寝室", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody StuRoom stuRoom)
@@ -86,7 +86,7 @@ public class StuRoomController extends BaseController
     /**
      * 修改寝室
      */
-    @PreAuthorize("@ss.hasPermi('dorm:room:edit')")
+    //@PreAuthorize("@ss.hasPermi('dorm:room:edit')")
     @Log(title = "寝室", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody StuRoom stuRoom)
@@ -97,7 +97,7 @@ public class StuRoomController extends BaseController
     /**
      * 删除寝室
      */
-    @PreAuthorize("@ss.hasPermi('dorm:room:remove')")
+    //@PreAuthorize("@ss.hasPermi('dorm:room:remove')")
     @Log(title = "寝室", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -108,7 +108,7 @@ public class StuRoomController extends BaseController
     /**
      * 获取专业列表
      */
-    @GetMapping(value = "/query-list/{buildingId}/{roomType}")
+    //@GetMapping(value = "/query-list/{buildingId}/{roomType}")
     @ApiOperation("根据楼宇id获取寝室列表")
     public TableDataInfo getList(@PathVariable("buildingId") Long buildingId,@PathVariable("roomType") Integer roomType)
     {

+ 7 - 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuTextBookController.java

@@ -40,7 +40,7 @@ public class StuTextBookController extends BaseController
     /**
      * 查询教材列表
      */
-    @PreAuthorize("@ss.hasPermi('system:book:list')")
+    //@PreAuthorize("@ss.hasPermi('system:book:list')")
     @GetMapping("/list")
     @ApiOperation(value = "列表")
     public TableDataInfo list(StuTextBook stuTextBook)
@@ -53,7 +53,7 @@ public class StuTextBookController extends BaseController
     /**
      * 导出教材列表
      */
-    @PreAuthorize("@ss.hasPermi('system:book:export')")
+    //@PreAuthorize("@ss.hasPermi('system:book:export')")
     @Log(title = "教材", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     @ApiOperation(value = "导出")
@@ -67,7 +67,7 @@ public class StuTextBookController extends BaseController
     /**
      * 获取教材详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:book:query')")
+    //@PreAuthorize("@ss.hasPermi('system:book:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation(value = "详情")
     public AjaxResult getInfo(@PathVariable("id") String id)
@@ -78,7 +78,7 @@ public class StuTextBookController extends BaseController
     /**
      * 新增教材
      */
-    @PreAuthorize("@ss.hasPermi('system:book:add')")
+    //@PreAuthorize("@ss.hasPermi('system:book:add')")
     @Log(title = "教材", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "新增")
@@ -90,7 +90,7 @@ public class StuTextBookController extends BaseController
     /**
      * 修改教材
      */
-    @PreAuthorize("@ss.hasPermi('system:book:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:book:edit')")
     @Log(title = "教材", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation(value = "修改")
@@ -102,7 +102,7 @@ public class StuTextBookController extends BaseController
     /**
      * 删除教材
      */
-    @PreAuthorize("@ss.hasPermi('system:book:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:book:remove')")
     @Log(title = "教材", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     @ApiOperation(value = "删除")
@@ -115,7 +115,7 @@ public class StuTextBookController extends BaseController
     /**
      * 删除教材
      */
-    @PreAuthorize("@ss.hasPermi('system:book:list')")
+    //@PreAuthorize("@ss.hasPermi('system:book:list')")
     @GetMapping("/bookList")
     @ApiOperation(value = "教材配置列表")
     public AjaxResult bookList()

+ 1 - 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/StuProfessionMapper.java

@@ -64,10 +64,9 @@ public interface StuProfessionMapper
 
     /**
      * 根据科系id查询专业列表
-     * @param departmentId
      * @return
      */
-    public List<Map<String,Object>> queryList(@Param("departmentId") Long departmentId);
+    public List<Map<String,Object>> queryList();
 
     /**
      * 根据专业名称查询专业

+ 1 - 2
ruoyi-system/src/main/java/com/ruoyi/system/service/IStuProfessionService.java

@@ -63,8 +63,7 @@ public interface IStuProfessionService
 
     /**
      * 根据科系id查询班级列表
-     * @param departmentId
      * @return
      */
-    public List<Map<String,Object>> queryList(Long departmentId);
+    public List<Map<String,Object>> queryList();
 }

+ 2 - 4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StuProfessionServiceImpl.java

@@ -98,12 +98,10 @@ public class StuProfessionServiceImpl implements IStuProfessionService
 
     /**
      * 根据科系id查询班级列表
-     *
-     * @param departmentId
      * @return
      */
     @Override
-    public List<Map<String,Object>> queryList(Long departmentId) {
-        return stuProfessionMapper.queryList(departmentId);
+    public List<Map<String,Object>> queryList() {
+        return stuProfessionMapper.queryList();
     }
 }

+ 2 - 2
ruoyi-system/src/main/resources/mapper/department/StuProfessionMapper.xml

@@ -96,8 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <!-- 查询科系列表 -->
-    <select id="queryList" parameterType="Long" resultType="Map">
-       SELECT id,profession_name AS professionName FROM stu_profession WHERE del_status=0 AND department_id=#{departmentId}
+    <select id="queryList"  resultType="Map">
+       SELECT id,profession_name AS professionName FROM stu_profession WHERE del_status=0
     </select>
     
     <select id="selectProfessionByProfessionName" parameterType="String" resultType="StuProfession">