Merge remote-tracking branch 'origin/master'

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

@@ -339,11 +339,12 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		// 收费形式
 		List<MusicGroupPaymentCalender> calenders = musicGroupPaymentCalenderDao.findByMusicGroupId(musicGroupId);
 
-		if (calenders == null || calenders.size() == 0) {
-			params.put("paymentcalender", "一次性");
+		/*if (calenders == null || calenders.size() == 0) {
+			
 		} else {
 			params.put("paymentcalender", calenders.stream().map(cal -> cal.getPaymentMonth().toString()).collect(Collectors.joining("月,")) + "月");
-		}
+		}*/
+		params.put("paymentcalender", "一次性");
 
 		params.put("isShowVisualSeal", false);
 
@@ -443,11 +444,13 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		// 收费形式
 		List<MusicGroupPaymentCalender> calenders = musicGroupPaymentCalenderDao.findByMusicGroupId(musicGroupId);
 
-		if (calenders == null || calenders.size() == 0) {
+		/*if (calenders == null || calenders.size() == 0) {
 			params.put("paymentcalender", "一次性");
 		} else {
 			params.put("paymentcalender", calenders.stream().map(cal -> cal.getPaymentMonth().toString()).collect(Collectors.joining("月,")) + "月");
-		}
+		}*/
+		
+		params.put("paymentcalender", "一次性");
 
 		params.put("isShowVisualSeal", true);