update

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

@@ -1054,8 +1054,8 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
         
 		if (studentInfo.getTenantId() == 1) {
 			if (OwnershipType.OWN.name().equals(params.get("ownershipType"))) {
-				params.put("compayName", "深圳大雅乐盟网络教育股份有限公司");
-				params.put("sealPicture", "https://daya-online.oss-cn-beijing.aliyuncs.com/website/cachet.png");
+				//params.put("compayName", "深圳大雅乐盟网络教育股份有限公司");
+				//params.put("sealPicture", "https://daya-online.oss-cn-beijing.aliyuncs.com/website/cachet.png");
 			} else {
 				params.put("compayName", "武汉长乐长风乐器销售有限公司");
 				params.put("sealPicture", "https://daya-online.oss-cn-beijing.aliyuncs.com/website/clcf.png");

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

@@ -2148,7 +2148,11 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 if(CollectionUtils.isEmpty(teacherSalary.getDeductReasons())){
                     teacherIncomeInfo.setDeductReasons(Collections.EMPTY_LIST);
                 }
-                teacherIncomeInfo.setTeacherAttendance(teacherAttendances.get(0));
+				if (teacherAttendances == null || teacherAttendances.size() == 0) {
+					teacherIncomeInfo.setTeacherAttendance(new TeacherAttendance());
+				} else {
+					teacherIncomeInfo.setTeacherAttendance(teacherAttendances.get(0));
+				}
                 if(Objects.nonNull(school)&&Objects.nonNull(teacherIncomeInfo.getTeacherAttendance())){
                     teacherIncomeInfo.getTeacherAttendance().setSchoolLongitudeLatitude(school.getLongitudeLatitude());
                 }

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

@@ -822,7 +822,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     public PageInfo<EduOrganStudentDataDto> queryOrganStudentOverView(List<Integer> organIds, OrganCloudStudyStudentDataQueryInfo queryInfo) {
         PageInfo<EduOrganStudentDataDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 
-        if(StringUtils.isNotBlank(queryInfo.getOrganIds())&&CollectionUtils.isEmpty(organIds)){
+        if(StringUtils.isNotBlank(queryInfo.getOrganIds())&&(organIds == null || organIds.size() == 0)){
             return pageInfo;
         }
         Integer tenantId = TenantContextHolder.getTenantId();