|  | @ -24,6 +24,7 @@ import com.epmet.modules.group.entity.ResiGroupSetupEntity; | 
			
		
	
		
		
			
				
					|  |  | import com.epmet.modules.group.redis.ResiGroupSetupRedis; |  |  | import com.epmet.modules.group.redis.ResiGroupSetupRedis; | 
			
		
	
		
		
			
				
					|  |  | import com.epmet.modules.group.service.ResiGroupSetupService; |  |  | import com.epmet.modules.group.service.ResiGroupSetupService; | 
			
		
	
		
		
			
				
					|  |  | import com.epmet.resi.group.dto.group.result.GroupTypeListResultDTO; |  |  | import com.epmet.resi.group.dto.group.result.GroupTypeListResultDTO; | 
			
		
	
		
		
			
				
					|  |  |  |  |  | import org.apache.commons.collections4.CollectionUtils; | 
			
		
	
		
		
			
				
					|  |  | import org.apache.commons.lang3.StringUtils; |  |  | import org.apache.commons.lang3.StringUtils; | 
			
		
	
		
		
			
				
					|  |  | import org.springframework.beans.factory.annotation.Autowired; |  |  | import org.springframework.beans.factory.annotation.Autowired; | 
			
		
	
		
		
			
				
					|  |  | import org.springframework.stereotype.Service; |  |  | import org.springframework.stereotype.Service; | 
			
		
	
	
		
		
			
				
					|  | @ -59,6 +60,9 @@ public class ResiGroupSetupServiceImpl extends BaseServiceImpl<ResiGroupSetupDao | 
			
		
	
		
		
			
				
					|  |  | 
 |  |  | 
 | 
			
		
	
		
		
			
				
					|  |  |         //初期所有客户共用一套建组设置,客户Id为default,后边可以根据token用户所属客户查询
 |  |  |         //初期所有客户共用一套建组设置,客户Id为default,后边可以根据token用户所属客户查询
 | 
			
		
	
		
		
			
				
					|  |  |         List<GroupTypeListResultDTO.SetUp> list = baseDao.selectGroupList(customerId); |  |  |         List<GroupTypeListResultDTO.SetUp> list = baseDao.selectGroupList(customerId); | 
			
		
	
		
		
			
				
					|  |  |  |  |  |         if(CollectionUtils.isEmpty(list)){ | 
			
		
	
		
		
			
				
					|  |  |  |  |  |             list = baseDao.selectGroupList(GroupActConstant.DEFAULT_CUSTOMER_ID); | 
			
		
	
		
		
			
				
					|  |  |  |  |  |         } | 
			
		
	
		
		
			
				
					|  |  |         list.forEach(l -> { |  |  |         list.forEach(l -> { | 
			
		
	
		
		
			
				
					|  |  |             if ("ordinary".equals(l.getGroupType())) { |  |  |             if ("ordinary".equals(l.getGroupType())) { | 
			
		
	
		
		
			
				
					|  |  |                 commonUsedGroup.add(l); |  |  |                 commonUsedGroup.add(l); | 
			
		
	
	
		
		
			
				
					|  | 
 |