| 
					
				 | 
			
			
				@ -515,10 +515,14 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if(accountType.equalsIgnoreCase("1")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            //更新类型 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            List<IotCompanyTypeDO> typeList = iotCompanyTypeDao.findByCompanyId(iotCompany.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           typeList.forEach(one->{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               one.setDel("1"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               iotCompanyTypeDao.save(one); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if (typeList!=null&&typeList.size()>0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                typeList.forEach(one->{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    one.setDel("1"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    iotCompanyTypeDao.save(one); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            List<IotCompanyTypeDO> companyTypes = new ArrayList<>(10); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            iotCompany.getTypeList().forEach(one->{ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -538,13 +542,23 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if(accountType.equalsIgnoreCase("0")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            IotCompanyAppDO newApp = iotCompany.getAppList().get(0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            IotCompanyAppDO oldApp = iotCompanyAppDao.findOne(newApp.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            oldApp.setAddressIp(newApp.getAddressIp()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            oldApp.setName(newApp.getName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            oldApp.setId(newApp.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            oldApp.setCompanyId(iotCompany.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            oldApp.setCompanyName(iotCompany.getName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            oldApp.setSaasId(getCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            iotCompanyAppDao.save(oldApp); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            //无应用 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if (oldApp!=null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                oldApp.setAddressIp(newApp.getAddressIp()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                oldApp.setName(newApp.getName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                oldApp.setId(newApp.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                oldApp.setCompanyId(iotCompany.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                oldApp.setCompanyName(iotCompany.getName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                oldApp.setSaasId(getCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                iotCompanyAppDao.save(oldApp); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            }else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                newApp.setDel("1"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                newApp.setCompanyName(iotCompany.getName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                newApp.setCompanyId(iotCompany.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                newApp.setSaasId(getCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                iotCompanyAppDao.save(newApp); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 |