| 
						
						
							
								
							
						
						
					 | 
					@ -173,7 +173,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    dto.setIdCard(map.get("ID_CARD")); | 
					 | 
					 | 
					                    dto.setIdCard(map.get("ID_CARD")); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    IcResiUserDTO userDTO = baseDao.getResiUser(dto); | 
					 | 
					 | 
					                    IcResiUserDTO userDTO = baseDao.getResiUser(dto); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    if (null != userDTO && null != userDTO.getIdCard()) { | 
					 | 
					 | 
					                    if (null != userDTO && null != userDTO.getIdCard()) { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					                        throw new RenException(EpmetErrorCode.OPERATION_FAILED.getCode(), EpmetErrorCode.OPERATION_FAILED.getMsg(), "新增居民信息失败,身份证号已存在!"); | 
					 | 
					 | 
					                        throw new RenException(EpmetErrorCode.OPERATION_FAILED.getCode(), EpmetErrorCode.OPERATION_FAILED.getMsg(), "新增居民信息失败,身份证号已存在!", RenException.MessageMode.CODE_INTERNAL_EXTERNAL); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					                    } | 
					 | 
					 | 
					                    } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                } | 
					 | 
					 | 
					                } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                //2021.11.25  end
 | 
					 | 
					 | 
					                //2021.11.25  end
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -231,7 +231,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    dto.setIdCard(map.get("ID_CARD")); | 
					 | 
					 | 
					                    dto.setIdCard(map.get("ID_CARD")); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    IcResiUserDTO userDTO = baseDao.getResiUser(dto); | 
					 | 
					 | 
					                    IcResiUserDTO userDTO = baseDao.getResiUser(dto); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    if (null != userDTO && null != userDTO.getIdCard()) { | 
					 | 
					 | 
					                    if (null != userDTO && null != userDTO.getIdCard()) { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					                        throw new RenException(EpmetErrorCode.OPERATION_FAILED.getCode(), EpmetErrorCode.OPERATION_FAILED.getMsg(), "修改居民信息失败,身份证号已存在!"); | 
					 | 
					 | 
					                        throw new RenException(EpmetErrorCode.OPERATION_FAILED.getCode(), EpmetErrorCode.OPERATION_FAILED.getMsg(), "修改居民信息失败,身份证号已存在!", RenException.MessageMode.CODE_INTERNAL_EXTERNAL); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					                    } | 
					 | 
					 | 
					                    } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                } | 
					 | 
					 | 
					                } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                //2021.11.25  end
 | 
					 | 
					 | 
					                //2021.11.25  end
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |