From e9c1bc2e789f6f9f8c52fbd10788ad5a0d1f841b Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 12 七月 2024 13:39:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java | 2 ++ src/main/java/com/ycl/jxkg/config/spring/security/SecurityConfigurer.java | 2 +- src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ycl/jxkg/config/spring/security/SecurityConfigurer.java b/src/main/java/com/ycl/jxkg/config/spring/security/SecurityConfigurer.java index 3bf787b..fb2a490 100644 --- a/src/main/java/com/ycl/jxkg/config/spring/security/SecurityConfigurer.java +++ b/src/main/java/com/ycl/jxkg/config/spring/security/SecurityConfigurer.java @@ -91,7 +91,7 @@ .authorizeRequests() .antMatchers(securityIgnoreUrls.toArray(ignores)).permitAll() .antMatchers("/api/admin/user/update/password").permitAll() - .antMatchers("/api/admin/**").hasRole(RoleEnum.ADMIN.getName()) + .antMatchers("/api/admin/**").hasAnyRole(RoleEnum.ADMIN.getName(),RoleEnum.TEACHER.getName()) .antMatchers("/api/student/**").hasRole(RoleEnum.STUDENT.getName()) .antMatchers("/api/register/**").anonymous() .anyRequest().permitAll() diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java index 7165840..947e312 100644 --- a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java +++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java @@ -70,11 +70,13 @@ return Result.ok(); } + @RequestMapping(value = "/selectQuestion/{id}", method = RequestMethod.POST) public Result<ExamPaperQuestion> selectQuestion(@PathVariable Integer id) { ExamPaperQuestion vo = examPaperQuestionService.selectById(id); return Result.ok(vo); } + @RequestMapping(value = "/select/{id}", method = RequestMethod.POST) public Result<ExamPaperEditRequestVO> select(@PathVariable Integer id) { ExamPaperEditRequestVO vm = examPaperService.examPaperToVM(id); diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java index c402ca5..904e0e2 100644 --- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java +++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java @@ -250,7 +250,7 @@ .eq(ExamSubmitTemp::getUserId, webContext.getCurrentUser().getId()) .one(); if (Objects.nonNull(hasJoin)) { - //TODO锛氬紑鍙戠幆澧冨厛鍏抽棴 + // 鍏佽鎻愪氦鍚庣户缁綔绛� // if(ExamSubmitTempStatusEnum.finish.equals(hasJoin.getStatus())){ // throw new RuntimeException("鎮ㄥ凡鎻愪氦璇曞嵎锛岃鍕块噸澶嶄綔绛�"); // } -- Gitblit v1.8.0