| 
						
						
							
								
							
						
						
					 | 
					@ -1061,13 +1061,20 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
						} | 
					 | 
					 | 
						} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
						@Override | 
					 | 
					 | 
						@Override | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
						public void submitGroupEdit(String groupId, String groupName, String groupHeadPhoto, String groupIntroduction) { | 
					 | 
					 | 
						public void submitGroupEdit(String groupId, String groupName, String groupHeadPhoto, String groupIntroduction, String editUserId) { | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
							// 1.判断小组是否存在,判断是否已经在"待审核"状态
 | 
					 | 
					 | 
							// 1.判断小组是否存在,判断是否已经在"待审核"状态
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							ResiGroupEntity group = resiGroupDao.selectById(groupId); | 
					 | 
					 | 
							ResiGroupEntity group = resiGroupDao.selectById(groupId); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							if (group == null) { | 
					 | 
					 | 
							if (group == null) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								throw new RenException(EpmetErrorCode.GROUP_NOT_EXISTS.getCode(), EpmetErrorCode.GROUP_NOT_EXISTS.getMsg()); | 
					 | 
					 | 
								throw new RenException(EpmetErrorCode.GROUP_NOT_EXISTS.getCode(), EpmetErrorCode.GROUP_NOT_EXISTS.getMsg()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							} | 
					 | 
					 | 
							} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
							// 判断是否是组长
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
							ResiGroupMemberDTO groupLeader = resiGroupMemberDao.selectLeaderMember(groupId); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
							if (groupLeader == null || !groupLeader.getCustomerUserId().equals(editUserId)) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
								String msg = "只有该组的组长才可以编辑组信息"; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
								throw new RenException(EpmetErrorCode.GROUP_EDIT_ERROR.getCode(), msg, msg, RenException.MessageMode.CODE_INTERNAL_EXTERNAL); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
							} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							// 2.判断是否可以提交编辑
 | 
					 | 
					 | 
							// 2.判断是否可以提交编辑
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							GroupEditSubmitRecordEntity lre = groupEditSubmitRecordDao.getLatestEditSubmitRecord(groupId); | 
					 | 
					 | 
							GroupEditSubmitRecordEntity lre = groupEditSubmitRecordDao.getLatestEditSubmitRecord(groupId); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							if (lre != null && GroupAuditStatusConstant.UNDER_AUDITING.equals(lre.getAuditStatus())) { | 
					 | 
					 | 
							if (lre != null && GroupAuditStatusConstant.UNDER_AUDITING.equals(lre.getAuditStatus())) { | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |