Merge branch 'saas_220228' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServiceImpl.java

@@ -1067,7 +1067,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     	
     	Calendar cal = Calendar.getInstance();    
         cal.setTime(new Date());    
-        cal.add(Calendar.WEEK_OF_YEAR, -1);// 一周    
+        //cal.add(Calendar.WEEK_OF_YEAR, -1);// 一周    
         cal.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
         Date endTime = cal.getTime();
         

mec-web/src/main/java/com/ym/mec/web/controller/StudentManageController.java

@@ -420,7 +420,7 @@ public class StudentManageController extends BaseController {
 
     @ApiOperation(value = "云教练学员数据预览列表")
     @GetMapping("/getCloudStudyStudentOverViewList")
-    //@PreAuthorize("@pcs.hasPermissions('studentManage/getCloudStudyStudentOverViewList')")
+    @PreAuthorize("@pcs.hasPermissions('studentManage/getCloudStudyStudentOverViewList')")
     public HttpResponseResult<List<IndexCloudStudyListDto>> getCloudStudyStudentOverViewList(String organIds) throws Exception {
         List<Integer> organIdsList;
         if(StringUtils.isNotBlank(organIds)){