Merge remote-tracking branch 'origin/saas' into saas

cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -229,7 +229,7 @@
 				and find_in_set(#{subjectId},sni.subject_id_list_)
 			</if>
 			<if test="organId != null">
-				and (find_in_set(#{organId},sni.organ_id_list_) or sni.organ_id_list_ is null)
+				and (find_in_set(#{organId},sni.organ_id_list_) or sni.organ_id_list_ is null or sni.organ_id_list_ = '')
 			</if>
 		<if test="clientName != 'manage'">
 			<choose>
@@ -265,6 +265,12 @@
 		<if test="search != null">
 			and sni.title_ like '%' #{search} '%'
 		</if>
+		<if test="excludeIds!=null and excludeIds.size()>0">
+			AND sni.id_ NOT IN
+			<foreach collection="excludeIds" item="excludeId" open="(" close=")" separator=",">
+				#{excludeId}
+			</foreach>
+		</if>
 			<if test="subjectId != null">
 				and find_in_set(#{subjectId},sni.subject_id_list_)
 			</if>

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/IndexBaseMonthDataDao.java

@@ -22,7 +22,7 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
                                 @Param("dataType")IndexDataType dataType);
 
     int deleteWithMonthAndType(@Param("months") Collection months,
-                               @Param("dataType")IndexDataType dataType);
+                               @Param("dataType")IndexDataType dataType,@Param("tenantId") Integer tenantId);
 
     IndexBaseMonthData getOrganDataWithDayAndDataType(@Param("organId") Integer organId,
                                                       @Param("day") String day,
@@ -223,7 +223,7 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
                            @Param("courseEndTimeError") String courseEndTimeError,@Param("tenantId") Integer tenantId);
 
     List<Map<Integer, Integer>> getOrganCourseTimeError(@Param("organIds") Set<Integer> organIds,
-                                                        @Param("classGroupIds") List<Long> classGroupIds);
+                                                        @Param("classGroupIds") List<Long> classGroupIds,@Param("tenantId") Integer tenantId);
 
     /**
      * 获取考勤异常编号

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/QuestionnaireQuestionItemDao.java

@@ -12,7 +12,7 @@ public interface QuestionnaireQuestionItemDao extends BaseDAO<Long, Questionnair
 
     void batchInsert(@Param("questionItemList") List<QuestionnaireQuestionItem> questionItemList,
                      @Param("questionId") Long questionId,
-                     @Param("topicId") Integer topicId);
+                     @Param("topicId") Integer topicId, @Param("tenantId") Integer tenantId);
 
     void batchDelByQuestionIdList(@Param("questionIdList") List<Long> delQuestionnaireQuestionIdList);
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/VipGroupActivity.java

@@ -147,9 +147,9 @@ public class VipGroupActivity extends BaseEntity {
 	@ApiModelProperty(value = "-1：所有；0：线上；1：线下")
 	private Integer giveTeachMode = -1;
 
-	private PeriodEnum periodEnum;
+	private PeriodEnum periodEnum = MONTH;
 
-	private PeriodEnum givePeriodEnum;
+	private PeriodEnum givePeriodEnum = DAY;
 
 	private String status = "DRAFT";
 

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

@@ -90,7 +90,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	@Transactional(rollbackFor = Exception.class)
 	public void add(Employee employee){
 		SysUser user = teacherDao.getUserWithPhone(employee.getPhone());
-		Integer tenantId = TenantContextHolder.getTenantId();
+		Integer tenantId = employee.getTenantId();
 		if(user != null && user.getId() != null){
 			checkTenantId(tenantId,user.getTenantId());
 			Employee employee1 = employeeDao.get(user.getId());
@@ -472,6 +472,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void simpleUpdate(Employee employee) {
+		employee.setUserId(employee.getId());
 		employee.setUpdateTime(new Date());
 		if(StringUtils.isNotEmpty(employee.getPhone())){
 			SysUser sysUser = teacherDao.getUserWithPhone(employee.getPhone());

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

@@ -608,7 +608,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			dataList.add(new IndexBaseMonthData(date, organId, tenantId));
 		}
 		if(!IndexDataType.NEWLY_STUDENT_NUM.equals(indexDataType)&&!IndexDataType.QUIT_MUSIC_GROUP_STUDENT_NUM.equals(indexDataType)){
-			indexBaseMonthDataDao.deleteWithMonthAndType(Arrays.asList(dayStr), indexDataType);
+			indexBaseMonthDataDao.deleteWithMonthAndType(Arrays.asList(dayStr), indexDataType, tenantId);
 		}
 		if(!CollectionUtils.isEmpty(dataList)){
 			indexBaseMonthDataDao.batchInsertWithDataType(dataList, indexDataType);
@@ -880,7 +880,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 			//课程时间安排异常
 			if(classGroupIds == null || classGroupIds.size() > 0){
-				List<Map<Integer, Integer>> courseTimeErrorMapList = indexBaseMonthDataDao.getOrganCourseTimeError(organIds, classGroupIds);
+				List<Map<Integer, Integer>> courseTimeErrorMapList = indexBaseMonthDataDao.getOrganCourseTimeError(organIds, classGroupIds, tenantId);
 				courseTimeErrorMap = MapUtil.mapListToMap(courseTimeErrorMapList, Integer.class, Integer.class);
 			}
 

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

@@ -55,7 +55,7 @@ public class QuestionnaireTopicServiceImpl extends BaseServiceImpl<Integer, Ques
 				Long questionId = questionnaireQuestion.getId();
 				List<QuestionnaireQuestionItem> questionItemList = questionnaireQuestion.getQuestionnaireQuestionItemList();
 				if(questionItemList != null && questionItemList.size() > 0){
-					questionnaireQuestionItemDao.batchInsert(questionItemList,questionId,topicId);
+					questionnaireQuestionItemDao.batchInsert(questionItemList,questionId,topicId, questionnaireTopic.getTenantId());
 				}
 			}
 		}
@@ -101,7 +101,7 @@ public class QuestionnaireTopicServiceImpl extends BaseServiceImpl<Integer, Ques
 						//获取删除的答案
 						List<QuestionnaireQuestionItem> insertItemList = questionItemList.stream().filter(e -> e.getId() == null).collect(Collectors.toList());
 						if(insertItemList != null && insertItemList.size() > 0){
-							questionnaireQuestionItemDao.batchInsert(insertItemList,questionId,topicId);
+							questionnaireQuestionItemDao.batchInsert(insertItemList,questionId,topicId,questionnaireTopic.getTenantId());
 						}
 					}
 				}
@@ -115,7 +115,7 @@ public class QuestionnaireTopicServiceImpl extends BaseServiceImpl<Integer, Ques
 					Long questionId = question.getId();
 					List<QuestionnaireQuestionItem> questionItemList = question.getQuestionnaireQuestionItemList();
 					if(questionItemList != null && questionItemList.size() > 0){
-						questionnaireQuestionItemDao.batchInsert(questionItemList,questionId,topicId);
+						questionnaireQuestionItemDao.batchInsert(questionItemList,questionId,topicId,questionnaireTopic.getTenantId());
 					}
 				}
 			}

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

@@ -639,13 +639,22 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
                 .map(TenantInfoDto::getPhone)
                 .map(sysUserFeignService::queryUserByMobile)
                 .orElse(null);
+        TenantInfo phone = this.getOne(new WrapperUtil<TenantInfo>().queryWrapper()
+                .eq("phone_", dto.getPhone()));
+        if (Objects.nonNull(phone)) {
+            throwPhoneBizEx(bucket);
+        }
         if (Objects.nonNull(sysUser)) {
-            bucket.delete();
-            throw new BizException("该手机号已被注册!");
+            throwPhoneBizEx(bucket);
         }
         return bucket;
     }
 
+    private void throwPhoneBizEx(RBucket<Object> bucket) {
+        bucket.delete();
+        throw new BizException("该手机号已被注册!");
+    }
+
     /**
      * set机构Id 并执行一个操作
      *

mec-biz/src/main/resources/config/mybatis/IndexBaseMonthDataMapper.xml

@@ -105,7 +105,7 @@
 
 	<delete id="deleteWithMonthAndType">
 		DELETE FROM index_base_month_data
-		WHERE DATE_FORMAT(month_, '%Y-%m-%d') IN
+		WHERE tenant_id_ = #{tenantId} and DATE_FORMAT(month_, '%Y-%m-%d') IN
 		<foreach collection="months" item="month" open="(" close=")" separator=",">
 			#{month}
 		</foreach>

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

@@ -122,7 +122,6 @@ public class EmployeeController extends BaseController {
     @PostMapping("/simpleUpdate")
     @PreAuthorize("@pcs.hasPermissions('employee/simpleUpdate')")
     public Object simpleUpdate(@RequestBody Employee employee) {
-
         employeeService.simpleUpdate(employee);
         return succeed();
     }

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

@@ -169,7 +169,7 @@ public class ExportController extends BaseController {
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=classGroup-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -207,7 +207,7 @@ public class ExportController extends BaseController {
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=classGroup-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -244,7 +244,7 @@ public class ExportController extends BaseController {
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=classGroup-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -280,7 +280,7 @@ public class ExportController extends BaseController {
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=classGroup-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -316,7 +316,7 @@ public class ExportController extends BaseController {
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=classGroup-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -354,7 +354,7 @@ public class ExportController extends BaseController {
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=classGroup-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -392,7 +392,7 @@ public class ExportController extends BaseController {
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=classGroup-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -440,7 +440,7 @@ public class ExportController extends BaseController {
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=classGroup-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -476,7 +476,7 @@ public class ExportController extends BaseController {
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=goods-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -511,7 +511,7 @@ public class ExportController extends BaseController {
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=vipGroupActivity-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -546,7 +546,7 @@ public class ExportController extends BaseController {
                     , "educationalTeacherName", "educationalTeacherId", "actualTeacherName", "actualTeacherId", "studentAttendanceStatus.msg"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=studentAttendance-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -579,7 +579,7 @@ public class ExportController extends BaseController {
                     "cloudAmount", "musicalAmount", "courseAmount", "accessoriesAmount", "maintenanceAmount", "activityAmount"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -612,7 +612,7 @@ public class ExportController extends BaseController {
                     "addCourseTotalTime", "courseCurrentPrice", "courseOriginalPrice", "memo", "operatorName", "auditStatus.desc", "createTime"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -646,7 +646,7 @@ public class ExportController extends BaseController {
                     "remark"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -679,7 +679,7 @@ public class ExportController extends BaseController {
                     "operatorRealName"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -712,7 +712,7 @@ public class ExportController extends BaseController {
                     "lastClassDate", "firstBuyTime", "intervalDay"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -747,7 +747,7 @@ public class ExportController extends BaseController {
                     "user.phone", "paymentChannel", "merNos", "status.msg", "memo", "paymentChannel.desc"}, paymentOrders);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -790,7 +790,7 @@ public class ExportController extends BaseController {
                     "studentSignInTime", "studentSignOutTime", "price", "rewards", "deductionReason", "courseIncome"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -826,7 +826,7 @@ public class ExportController extends BaseController {
                     "expectRewardAmount", "settlementDate", "memo"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -865,7 +865,7 @@ public class ExportController extends BaseController {
                     "experienceMembershipEndTime","membershipEndTime == null ? \"未试用\" : membershipDay >= 0 ? membershipDay : \"已失效\""}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -915,7 +915,7 @@ public class ExportController extends BaseController {
                     "groupStatus.desc", "payStatus", "memo"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -955,7 +955,7 @@ public class ExportController extends BaseController {
                     "courseStartDate", "coursesExpireDate", "registrationStartTime", "userInfo", "vipGroupCategoryName", "stopReason"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -1031,7 +1031,7 @@ public class ExportController extends BaseController {
                     "organName", "chargeType.msg", "title", "openFlagStr", "amount", "createTime", "userName", "orderType", "operatorName"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -1066,7 +1066,7 @@ public class ExportController extends BaseController {
                     "brief", "memo", "type.desc", "name", "specification", "sellCount"}, musicalList);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -1097,7 +1097,7 @@ public class ExportController extends BaseController {
                     "organName", "musicGroupName", "userId", "username", "subjectName", "musicalName", "kitGroupPurchaseTypeEnum.msg", "musicalAmount", "accessoriesName", "accessoriesAmount", "courseAmount", "cloudTeacherAmount", "maintenanceAmount", "orderAmount"}, musicalList);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -1156,7 +1156,7 @@ public class ExportController extends BaseController {
                     "studentName", "parentsName", "currentGrade", "currentClass", "gender.description", "isAllowAdjust.msg", "subjectName", "actualSubjectName", "parentsPhone", "paymentStatus.desc", "kitGroupPurchaseTypeEnum.msg","payingStatusStr","hasCloudTeacher==1？'有':'没有'"}, studentApplyDetail);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -1187,7 +1187,7 @@ public class ExportController extends BaseController {
                     "userId", "username", "phone", "type.msg", "name", "actualSalary", "subsidy", "settlementTime", "teacherRole.msg"}, teacherSalaries);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -1343,7 +1343,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, musicGroupStudentsDtoPageInfo.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -1371,11 +1371,7 @@ public class ExportController extends BaseController {
         // PageInfo<CourseReviewDto> practiceGroupReviews = courseReviewService.findPracticeGroupReviews(queryInfo);
         PageInfo<CourseReviewDto> practiceGroupReviews = courseReviewService.getVipCourseReviews(queryInfo);
         if (practiceGroupReviews.getTotal() <= 0) {
-            response.setStatus(500);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
@@ -1427,7 +1423,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, practiceGroupReviews.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -1453,11 +1449,7 @@ public class ExportController extends BaseController {
 
         List<CourseGroupExportDto> practiceGroupExports = practiceGroupDao.getPracticeGroupExport(organIds, TenantContextHolder.getTenantId());
         if (practiceGroupExports == null || practiceGroupExports.size() == 0) {
-            response.setStatus(500);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         OutputStream outputStream = response.getOutputStream();
         Set<Integer> studentIds = practiceGroupExports.stream().map(CourseGroupExportDto::getStudentId).collect(Collectors.toSet());
@@ -1495,7 +1487,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, practiceGroupExports);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -1518,11 +1510,7 @@ public class ExportController extends BaseController {
     public void vipGroup(HttpServletResponse response) throws IOException {
         List<CourseGroupExportDto> vipGroupExports = courseScheduleDao.getVipGroupExport(organizationService.getEmployeeOrgan(""));
         if (vipGroupExports == null || vipGroupExports.size() == 0) {
-            response.setStatus(500);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         OutputStream outputStream = response.getOutputStream();
         Set<Integer> studentIds = vipGroupExports.stream().map(CourseGroupExportDto::getStudentId).collect(Collectors.toSet());
@@ -1570,7 +1558,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, vipGroupExports);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -1596,11 +1584,7 @@ public class ExportController extends BaseController {
         queryInfo.setOrganIdList(organizationService.getEmployeeOrgan(queryInfo.getOrganIdList()));
         List<ExtraExerciseStudentsDto> rows = extracurricularExercisesReplyService.findExtraExercises(queryInfo).getRows();
         if (CollectionUtils.isEmpty(rows)) {
-            response.setStatus(500);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         for (ExtraExerciseStudentsDto row : rows) {
             row.setStatusStr(Objects.isNull(row.getStatus()) || row.getStatus() == 0 ? "否" : "是");
@@ -1641,11 +1625,7 @@ public class ExportController extends BaseController {
         queryInfo.setOrganIdList(organizationService.getEmployeeOrgan(queryInfo.getOrganIdList()));
         List<StudentExercisesSituationDto> rows = studentExtracurricularExercisesSituationService.findStudentExtracurricularExercisesSituations(queryInfo).getRows();
         if (CollectionUtils.isEmpty(rows)) {
-            response.setStatus(500);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         OutputStream ouputStream = null;
         try {
@@ -1680,11 +1660,7 @@ public class ExportController extends BaseController {
         queryInfo.setOrganIdList(organizationService.getEmployeeOrgan(queryInfo.getOrganIdList()));
         List<TeacherCourseSalaryDetail4WebDto> rows = courseScheduleTeacherSalaryService.findIsSettlementCourseSalarys(queryInfo).getRows();
         if (CollectionUtils.isEmpty(rows)) {
-            response.setStatus(500);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         for (TeacherCourseSalaryDetail4WebDto row : rows) {
             if (Objects.isNull(row.getSignInTime())) {
@@ -1815,11 +1791,7 @@ public class ExportController extends BaseController {
         queryInfo.setRows(49999);
         PageInfo<CourseReviewDto> practiceGroupReviews = courseReviewService.getVipCourseReviews(queryInfo);
         if (practiceGroupReviews.getTotal() <= 0) {
-            response.setStatus(500);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
@@ -1871,7 +1843,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, practiceGroupReviews.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -1898,11 +1870,7 @@ public class ExportController extends BaseController {
         queryInfo.setRows(65000);
         PageInfoDegree<DegreeRegistration> pageList = degreeRegistrationService.getPageList(queryInfo);
         if (pageList.getTotal() <= 0) {
-            response.setStatus(200);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
@@ -1924,7 +1892,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, pageList.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -1950,11 +1918,7 @@ public class ExportController extends BaseController {
         queryInfo.setRows(65000);
         PageInfo<CooperationOrgan> pageList = cooperationOrganService.queryPage(queryInfo);
         if (pageList.getTotal() <= 0) {
-            response.setStatus(200);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
@@ -1964,7 +1928,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, pageList.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=cooperationOrgan-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -1994,11 +1958,7 @@ public class ExportController extends BaseController {
         List<MusicGroupRegisterDto> musicGroupRegisters = musicGroupDao.getMusicGroupRegister(musicGroupStatusList, organIds, TenantContextHolder.getTenantId());
 
         if (musicGroupRegisters.size() <= 0) {
-            response.setStatus(200);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         List<String> musicGroupIds = musicGroupRegisters.stream().map(MusicGroupRegisterDto::getMusicGroupId).collect(Collectors.toList());
 
@@ -2085,7 +2045,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(headerStr, bodyStr, data);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -2161,11 +2121,7 @@ public class ExportController extends BaseController {
     public void exportTeacherDefaultSalary(String organIdList, HttpServletResponse response) throws IOException {
         List<TeacherDefaultSalaryDto> pageList = teacherService.queryTeacherDefaultSalary(organIdList);
         if (pageList.size() <= 0) {
-            response.setStatus(200);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
@@ -2186,7 +2142,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, pageList);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=teacherDefaultSalary-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -2219,11 +2175,7 @@ public class ExportController extends BaseController {
         List<MusicGroupRegisterDto> musicGroupRegisters = musicGroupDao.getMusicGroupRegister(musicGroupStatusList, organIds, TenantContextHolder.getTenantId());
 
         if (musicGroupRegisters.size() <= 0) {
-            response.setStatus(200);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         List<String> musicGroupIds = musicGroupRegisters.stream().map(MusicGroupRegisterDto::getMusicGroupId).collect(Collectors.toList());
 
@@ -2278,7 +2230,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(headerStr, bodyStr, data);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -2312,11 +2264,7 @@ public class ExportController extends BaseController {
         List<OrderByTypeExportDto> orders = studentPaymentOrderDao.getOrderByMonthAndType(organIds, orderTypeList, startTime, EndTime);
 
         if (orders.size() <= 0) {
-            response.setStatus(200);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         List<Long> vipGroupIds = orders.stream().filter(e -> e.getGroupType().equals(GroupType.VIP)).map(OrderByTypeExportDto::getMusicGroupId).collect(Collectors.toList());
         List<Long> practiceGroupIds = orders.stream().filter(e -> e.getGroupType().equals(GroupType.PRACTICE)).map(OrderByTypeExportDto::getMusicGroupId).collect(Collectors.toList());
@@ -2368,7 +2316,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, orders);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -2425,7 +2373,7 @@ public class ExportController extends BaseController {
                     "schoolName", "eduTeacher", "receiveStatusStr", "status.msg"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -2455,11 +2403,7 @@ public class ExportController extends BaseController {
         queryInfo.setRows(49999);
         PageInfo<MusicArrearageStudentDto> result = musicGroupPaymentCalenderDetailService.queryArrearageStudents(queryInfo);
         if (CollectionUtils.isEmpty(result.getRows())) {
-            response.setStatus(200);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
@@ -2468,7 +2412,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, result.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=teacherDefaultSalary-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -2494,11 +2438,7 @@ public class ExportController extends BaseController {
         queryInfo.setRows(49999);
         PageInfo<MusicGroupQuit> result = musicGroupQuitService.queryPage(queryInfo);
         if (CollectionUtils.isEmpty(result.getRows())) {
-            response.setStatus(200);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
@@ -2507,7 +2447,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, result.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=teacherDefaultSalary-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -2537,11 +2477,7 @@ public class ExportController extends BaseController {
         queryInfo.setRows(49999);
         PageInfo<TeacherServeDto> result = studentExtracurricularExercisesSituationService.queryTeacherServeInfo(queryInfo);
         if (CollectionUtils.isEmpty(result.getRows())) {
-            response.setStatus(200);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         OutputStream outputStream = response.getOutputStream();
 
@@ -2568,7 +2504,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, result.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=teacherDefaultSalary-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -2596,11 +2532,7 @@ public class ExportController extends BaseController {
         organId = organizationService.getEmployeeOrgan(sysUser.getId(),organId,sysUser.getIsSuperAdmin());
         List<IndexErrorDataExportDto> result = indexService.exportIndexErrData(organId, errorType);
         if (CollectionUtils.isEmpty(result)) {
-            response.setStatus(200);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         OutputStream outputStream = response.getOutputStream();
 
@@ -2614,7 +2546,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, result);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=teacherDefaultSalary-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -2644,11 +2576,7 @@ public class ExportController extends BaseController {
         queryInfo.setRows(49999);
         PageInfo<TeacherCourseStatistics> result = teacherCourseStatisticsService.queryPageDetail(queryInfo);
         if (CollectionUtils.isEmpty(result.getRows())) {
-            response.setStatus(200);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         OutputStream outputStream = response.getOutputStream();
 
@@ -2660,7 +2588,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, result.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=teacherDefaultSalary-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -2690,11 +2618,7 @@ public class ExportController extends BaseController {
         queryInfo.setRows(49999);
         List<IndexErrorDataExportDto> result = indexErrDataRecordService.queryRecord(queryInfo).getRows();
         if (CollectionUtils.isEmpty(result)) {
-            response.setStatus(200);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         OutputStream outputStream = response.getOutputStream();
 
@@ -2706,7 +2630,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, result);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=teacherDefaultSalary-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -2736,11 +2660,7 @@ public class ExportController extends BaseController {
         queryInfo.setRows(49999);
         List<Teacher> rows = teacherService.queryPageDetail(queryInfo).getRows();
         if (CollectionUtils.isEmpty(rows)) {
-            response.setStatus(200);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
@@ -2751,7 +2671,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=teacherPage-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -2776,11 +2696,7 @@ public class ExportController extends BaseController {
         queryInfo.setRows(49999);
         List<EmployeeInfo> rows = employeeInfoService.queryPage(queryInfo).getRows();
         if (CollectionUtils.isEmpty(rows)) {
-            response.setStatus(200);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
@@ -2797,7 +2713,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=employeeInfo-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -2822,11 +2738,7 @@ public class ExportController extends BaseController {
         queryInfo.setRows(49999);
         List<TeacherStudentDataDto> rows = teacherService.queryMemberStudentData(queryInfo).getRows();
         if (CollectionUtils.isEmpty(rows)) {
-            response.setStatus(200);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
@@ -2836,7 +2748,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=employeeInfo-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -2874,11 +2786,7 @@ public class ExportController extends BaseController {
         }
         List<EduOrganStudentDataDto> rows = studentService.queryOrganStudentOverView(ids, queryInfo).getRows();
         if (CollectionUtils.isEmpty(rows)) {
-            response.setStatus(200);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
@@ -2888,7 +2796,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=employeeInfo-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -2926,11 +2834,7 @@ public class ExportController extends BaseController {
         }
         List<EduOrganStudentDataDto> rows = indexService.organStudentOverView(ids, queryInfo).getRows();
         if (CollectionUtils.isEmpty(rows)) {
-            response.setStatus(200);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
@@ -2940,7 +2844,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=employeeInfo-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -2970,11 +2874,7 @@ public class ExportController extends BaseController {
 
         List<EduOrganStudentListExportDto> rows = ((PageInfo<EduOrganStudentListExportDto>)studentService.exportOrganStudentData(queryInfo).getDetail()).getRows();
         if (CollectionUtils.isEmpty(rows)) {
-            response.setStatus(200);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         for (EduOrganStudentListExportDto row : rows) {
             row.setCloudStudyUseTime(Math.round(row.getCloudStudyUseTime()));
@@ -2993,7 +2893,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=employeeInfo-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -3043,7 +2943,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=employeeInfo-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -3072,11 +2972,7 @@ public class ExportController extends BaseController {
         queryInfo.setRows(49999);
         List<CloudTeacherActiveTargetDetailDto> rows = studentService.countCloudTeacherActiveDetail(queryInfo).getRows();
         if (CollectionUtils.isEmpty(rows)) {
-            response.setStatus(200);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
-            return;
+            throw new BizException("没有可导出的记录");
         }
         //获取分部年级列表
         Map<Integer, String> gradeList = organizationService.getGradeList(Integer.parseInt(queryInfo.getOrganIds()));
@@ -3096,7 +2992,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=employeeInfo-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -3121,10 +3017,10 @@ public class ExportController extends BaseController {
         queryInfo.setRows(49999);
         PageInfo<MusicEnlightenmentQuestionnaire> practiceGroupReviews = musicEnlightenmentQuestionnaireService.queryPage(queryInfo);
         if (practiceGroupReviews.getTotal() <= 0) {
-            response.setStatus(500);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
+            
+            
+            
+            
             return;
         }
         OutputStream outputStream = response.getOutputStream();
@@ -3139,7 +3035,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, practiceGroupReviews.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();
@@ -3164,10 +3060,10 @@ public class ExportController extends BaseController {
         queryInfo.setRows(49999);
         List<TeacherServeDto> list = studentExtracurricularExercisesSituationService.queryTeacherPerformanceIndicator(queryInfo);
         if (list.size() <= 0) {
-            response.setStatus(500);
-            response.setContentType("Content-Type: application/json;charset=UTF-8");
-            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
-            response.flushBuffer();
+            
+            
+            
+            
             return;
         }
         OutputStream outputStream = response.getOutputStream();
@@ -3177,7 +3073,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, list);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=teacherPerformanceIndicator-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
+            
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.flush();

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

@@ -26,11 +26,11 @@ public class SysEmployeePositionController extends BaseController {
     @ApiOperation(value = "获取分部下员工职位列表")
     @GetMapping("/findOrganPosition")
     @PreAuthorize("@pcs.hasPermissions('employeePosition/findOrganPosition')")
-    public Object findAll(String organIds) throws Exception {
-        if(StringUtils.isEmpty(organIds)){
-            organIds = organizationService.getEmployeeOrgan(organIds);
+    public Object findAll(String id) throws Exception {
+        if(StringUtils.isEmpty(id)){
+            id = organizationService.getEmployeeOrgan(id);
         }
         Integer tenantId = TenantContextHolder.getTenantId();
-        return succeed(employeePositionService.findOrganPosition(organIds, tenantId));
+        return succeed(employeePositionService.findOrganPosition(id, tenantId));
     }
 }