首页小红点bug

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

@@ -905,12 +905,6 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		resultMap.put("musicPatrol",flag1);
 		boolean flag2 = false;
 		if(!flag2){
-			int countNoPaymentStudentNum = indexBaseMonthDataDao.countNoPaymentStudentNum(organIds,educationUserId, 0);
-			if(countNoPaymentStudentNum > 0){
-				flag2 = true;
-			}
-		}
-		if(!flag2){
 			List<Long> quitGroupNum = indexBaseMonthDataDao.queryApplyForQuitGroupNum(organIds,educationUserId);
 			if(quitGroupNum.size() > 0){
 				flag2 = true;
@@ -952,13 +946,6 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 		boolean flag4 = false;
 		if(!flag4){
-			String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
-			int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
-			if(lowTeacherSalary > 0){
-				flag4 = true;
-			}
-		}
-		if(!flag4){
 			int courseTimeError = 0;
 			if(classGroupIds == null || classGroupIds.size() > 0){
 				courseTimeError = indexBaseMonthDataDao.getCourseTimeError(organIds,classGroupIds);
@@ -1001,19 +988,35 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		}
 		resultMap.put("attendanceServe",flag4);
 
-		//获取关联的乐团列表
-		List<String> musicGroupIds = musicGroupDao.queryIdsByEduIdAndOrganIds(educationUserId,organIdsStr);
-		if(musicGroupIds.size() > 0){
-			String configValue1 = sysConfigDao.findConfigValue("push_create_payment_calender");
-			date = new Date();
-			String format = DateUtil.format(date, DateUtil.DEFAULT_PATTERN);
-			List<Long> calenderIds = musicGroupPaymentCalenderDao.queryEndIds(configValue1, format,musicGroupIds);
-			if(calenderIds.size() > 0){
-				resultMap.put("remindMatterData",true);
-			}else {
-				resultMap.put("remindMatterData",false);
+		boolean flag5 = false;
+		if(!flag5){
+			String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
+			int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
+			if(lowTeacherSalary > 0){
+				flag5 = true;
 			}
 		}
+		if(!flag5){
+			int countNoPaymentStudentNum = indexBaseMonthDataDao.countNoPaymentStudentNum(organIds,educationUserId, 0);
+			if(countNoPaymentStudentNum > 0){
+				flag5 = true;
+			}
+		}
+		if(!flag5){
+			//获取关联的乐团列表
+			List<String> musicGroupIds = musicGroupDao.queryIdsByEduIdAndOrganIds(educationUserId,organIdsStr);
+			if(musicGroupIds.size() > 0){
+				String configValue1 = sysConfigDao.findConfigValue("push_create_payment_calender");
+				date = new Date();
+				String format = DateUtil.format(date, DateUtil.DEFAULT_PATTERN);
+				List<Long> calenderIds = musicGroupPaymentCalenderDao.queryEndIds(configValue1, format,musicGroupIds);
+				if(calenderIds.size() > 0){
+					flag5 = true;
+				}
+			}
+		}
+		resultMap.put("remindMatterData",flag5);
+
 		return resultMap;
 	}
 }