|  |  | @ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.tools.exception.EpmetErrorCode; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.tools.exception.EpmetException; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.tools.redis.common.CustomerOrgRedis; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.tools.security.dto.TokenDto; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.tools.utils.ConvertUtils; | 
			
		
	
	
		
			
				
					|  |  | @ -96,7 +94,9 @@ public class MyHomeServiceImpl implements MyHomeService { | 
			
		
	
		
			
				
					|  |  |  |         IcResiUserEntity icUser = icResiUserDao.selectOne(userWrapper); | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |         if (null != icUser && !icUser.getHomeId().equals(formDTO.getHomeId())) { | 
			
		
	
		
			
				
					|  |  |  |             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "已绑定其他房屋", "已绑定其他房屋"); | 
			
		
	
		
			
				
					|  |  |  |             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), | 
			
		
	
		
			
				
					|  |  |  |                     "人员与房屋信息不匹配,请与工作人员联系。", | 
			
		
	
		
			
				
					|  |  |  |                     "人员与房屋信息不匹配,请与工作人员联系。"); | 
			
		
	
		
			
				
					|  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |         //进入网格(entergrid)流程
 | 
			
		
	
	
		
			
				
					|  |  | @ -152,25 +152,6 @@ public class MyHomeServiceImpl implements MyHomeService { | 
			
		
	
		
			
				
					|  |  |  |             userResiInfoDTO.setApp("resi"); | 
			
		
	
		
			
				
					|  |  |  |             userResiInfoService.saveResiInfo(userResiInfoDTO); | 
			
		
	
		
			
				
					|  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  |         //2.添加ic_resi_user信息
 | 
			
		
	
		
			
				
					|  |  |  |         HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(formDTO.getCustomerId(), formDTO.getHomeId()); | 
			
		
	
		
			
				
					|  |  |  |         if (null == houseInfo) { | 
			
		
	
		
			
				
					|  |  |  |             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败"); | 
			
		
	
		
			
				
					|  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  |         AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(houseInfo.getAgencyId()); | 
			
		
	
		
			
				
					|  |  |  |         if (null == agencyInfo) { | 
			
		
	
		
			
				
					|  |  |  |             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取组织信息失败", "获取组织信息失败"); | 
			
		
	
		
			
				
					|  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  |         IcResiUserEntity icUserEntity = ConvertUtils.sourceToTarget(formDTO, IcResiUserEntity.class); | 
			
		
	
		
			
				
					|  |  |  |         icUserEntity.setName(formDTO.getSurname() + formDTO.getName()); | 
			
		
	
		
			
				
					|  |  |  |         icUserEntity.setAgencyId(houseInfo.getAgencyId()); | 
			
		
	
		
			
				
					|  |  |  |         icUserEntity.setPids(agencyInfo.getPids()); | 
			
		
	
		
			
				
					|  |  |  |         if (null != icUser) { | 
			
		
	
		
			
				
					|  |  |  |             icUserEntity.setId(icUser.getId()); | 
			
		
	
		
			
				
					|  |  |  |             icResiUserDao.updateById(icUserEntity); | 
			
		
	
		
			
				
					|  |  |  |         } else { | 
			
		
	
		
			
				
					|  |  |  |             icResiUserDao.insert(icUserEntity); | 
			
		
	
		
			
				
					|  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  |     } | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |     /** | 
			
		
	
	
		
			
				
					|  |  | 
 |