| 
					
				 | 
			
			
				@@ -12,10 +12,12 @@ import com.ym.mec.common.entity.ImGroupMember; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.common.entity.ImGroupModel; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.common.service.impl.BaseServiceImpl; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.im.ImFeignService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.beans.factory.annotation.Autowired; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.stereotype.Service; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.transaction.annotation.Transactional; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.util.ArrayList; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.List; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.UUID; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -71,11 +73,17 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			//保存乐团声部规划 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			if (musicGroupSubjectPlans == null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				musicGroupSubjectPlans = new ArrayList<MusicGroupSubjectPlan>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			musicGroupSubjectPlans.forEach(e ->{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				e.setMusicGroupId(musicGroupId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				musicGroupSubjectPlanDao.insert(e); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			}); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			//保存乐团声部商品规划 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			if (musicGroupSubjectGoodsGroups == null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				musicGroupSubjectGoodsGroups = new ArrayList<MusicGroupSubjectGoodsGroup>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			musicGroupSubjectGoodsGroups.forEach(e->{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				e.setMusicGroupId(musicGroupId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				musicGroupSubjectGoodsGroupDao.insert(e); 
			 |