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

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

@@ -367,13 +367,17 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			Map<String, List<SimpleUserDto>> organPosition = employeePositionService.findOrganPosition(null, tenantId);
 			List<SimpleUserDto> transactionTeachers = organPosition.get(SysUserRoleEnum.JOIN_TEACHER.name());
 			Map<Integer, Integer> organTeacherNumMap = new HashMap<>();
-			for (SimpleUserDto transactionTeacher : transactionTeachers) {
-				Set<Integer> organIds = Arrays.stream(transactionTeacher.getOrganIds().split(",")).map(s -> Integer.valueOf(s)).collect(Collectors.toSet());
-				for (Integer organId : organIds) {
-					if(organTeacherNumMap.containsKey(organId)){
-						organTeacherNumMap.put(organId, organTeacherNumMap.get(organId)+1);
-					}else{
-						organTeacherNumMap.put(organId, 1);
+			if (transactionTeachers != null) {
+				for (SimpleUserDto transactionTeacher : transactionTeachers) {
+					Set<Integer> organIds = Arrays.stream(transactionTeacher.getOrganIds().split(","))
+												  .map(s -> Integer.valueOf(s))
+												  .collect(Collectors.toSet());
+					for (Integer organId : organIds) {
+						if (organTeacherNumMap.containsKey(organId)) {
+							organTeacherNumMap.put(organId, organTeacherNumMap.get(organId) + 1);
+						} else {
+							organTeacherNumMap.put(organId, 1);
+						}
 					}
 				}
 			}