Merge branch 'err_data_export'

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

@@ -184,7 +184,10 @@ public class IndexErrDataRecordServiceImpl extends BaseServiceImpl<Long, IndexEr
 			queryOrganIds = Arrays.stream(organIds.split(",")).map(Integer::new).collect(Collectors.toSet());
 		}
 		List<Integer> allDealUserIds = indexErrDataRecordDao.getAllDealUserIds(queryOrganIds);
-		List<SimpleUserDto> users = teacherDao.getUsersSimpleInfo(allDealUserIds);
+		List<SimpleUserDto> users = new ArrayList<>();
+		if(!CollectionUtils.isEmpty(allDealUserIds)){
+			users = teacherDao.getUsersSimpleInfo(allDealUserIds);
+		}
 		return users;
 	}
 

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

@@ -23,6 +23,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -49,6 +50,7 @@ public class IndexErrDataRecordController extends BaseController {
 
     @ApiOperation(value = "历史异常记录")
     @GetMapping("/queryRecord")
+    @PreAuthorize("@pcs.hasPermissions('indexErrDataRecord/queryRecord')")
     public HttpResponseResult<PageInfo<IndexErrorDataExportDto>> queryRecord(IndexErrRecordQueryInfo queryInfo){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
@@ -70,6 +72,7 @@ public class IndexErrDataRecordController extends BaseController {
 
     @ApiOperation(value = "异常记录汇总")
     @GetMapping("/errDataSummarizing")
+    @PreAuthorize("@pcs.hasPermissions('indexErrDataRecord/errDataSummarizing')")
     public HttpResponseResult errDataSummarizing(IndexErrRecordQueryInfo queryInfo){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
@@ -91,6 +94,7 @@ public class IndexErrDataRecordController extends BaseController {
 
     @ApiOperation(value = "获取所有异常相关教务人员")
     @GetMapping("/getAllEducationUsers")
+    @PreAuthorize("@pcs.hasPermissions('indexErrDataRecord/getAllEducationUsers')")
     public HttpResponseResult getAllEducationUsers(String organIds){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
@@ -112,6 +116,7 @@ public class IndexErrDataRecordController extends BaseController {
 
     @ApiOperation(value = "乐团巡查事项异常/乐团巡查任务未提交")
     @GetMapping("/queryErrInspectionData")
+    @PreAuthorize("@pcs.hasPermissions('indexErrDataRecord/queryErrInspectionData')")
     public HttpResponseResult<PageInfo<InspectionItemPlan>> queryErrInspectionData(InspectionItemPlanQueryInfo queryInfo){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
@@ -142,6 +147,7 @@ public class IndexErrDataRecordController extends BaseController {
 
     @ApiOperation(value = "回访任务未完成")
     @GetMapping("/queryErrStudentVisit")
+    @PreAuthorize("@pcs.hasPermissions('indexErrDataRecord/queryErrStudentVisit')")
     public HttpResponseResult<PageInfo<InspectionItem>> queryErrStudentVisit(InspectionQueryInfo queryInfo){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
@@ -169,6 +175,7 @@ public class IndexErrDataRecordController extends BaseController {
 
     @ApiOperation(value = "课程考勤异常/课程异常")
     @GetMapping("/queryHistoryErrCourseData")
+    @PreAuthorize("@pcs.hasPermissions('indexErrDataRecord/queryHistoryErrCourseData')")
     public HttpResponseResult<PageInfo<CourseScheduleEndDto>> queryHistoryErrCourseData(EndCourseScheduleQueryInfo queryInfo){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {