Преглед изворни кода

Merge branch 'master' of http://git.dayaedu.com/yonge/mec

zouxuan пре 5 година
родитељ
комит
1debecd59a

+ 2 - 1
mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/provider/service/DefaultUserDetailsService.java

@@ -63,8 +63,9 @@ public class DefaultUserDetailsService implements UserDetailsService {
 
 		if (authorities == null) {
 			authorities = new ArrayList<>();
-			authorities.add(new SimpleGrantedAuthority(StringUtils.lowerCase(userType)));
 		}
+		
+		authorities.add(new SimpleGrantedAuthority(StringUtils.lowerCase(userType)));
 
 		for (String role : roles) {
 			authorities.add(new SimpleGrantedAuthority(StringUtils.lowerCase(role)));

+ 1 - 1
mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleController.java

@@ -152,7 +152,7 @@ public class CourseScheduleController extends BaseController {
     }
 
     @ApiOperation(value = "课时调整")
-    @PreAuthorize("@pcs.hasPermissions('courseSchedule/classStartDateAdjust')")
+    @PreAuthorize("@pcs.hasPermissions('courseSchedule/classStartDateAdjust','system')")
     @PostMapping(value = "/classStartDateAdjust",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object classStartDateAdjust(CourseSchedule courseSchedule){
         CourseSchedule oldCourseSchedule = scheduleService.get(courseSchedule.getId());