|  | @@ -772,7 +772,7 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
 | 
	
		
			
				|  |  |      @Override
 | 
	
		
			
				|  |  |      public String checkUFNoUnique(TWarehouse tWarehouse) {
 | 
	
		
			
				|  |  |          TWarehouse tWarehouse1 = tWarehouseMapper.checkFNoUnique(tWarehouse.getfNo());
 | 
	
		
			
				|  |  | -        if (StringUtils.isNotNull(tWarehouse1) && tWarehouse1.getfId() != tWarehouse.getfId()) {
 | 
	
		
			
				|  |  | +        if (StringUtils.isNotNull(tWarehouse1) && !tWarehouse1.getfId().equals(tWarehouse.getfId())) {
 | 
	
		
			
				|  |  |              return UserConstants.NOT_UNIQUE;
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          return UserConstants.UNIQUE;
 | 
	
	
		
			
				|  | @@ -781,7 +781,7 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
 | 
	
		
			
				|  |  |      @Override
 | 
	
		
			
				|  |  |      public String checkUFNnameUnique(TWarehouse tWarehouse) {
 | 
	
		
			
				|  |  |          TWarehouse tWarehouse1 = tWarehouseMapper.checkUFNnameUnique(tWarehouse.getfName());
 | 
	
		
			
				|  |  | -        if (StringUtils.isNotNull(tWarehouse1) && tWarehouse1.getfId() != tWarehouse.getfId()) {
 | 
	
		
			
				|  |  | +        if (StringUtils.isNotNull(tWarehouse1) && !tWarehouse1.getfId().equals(tWarehouse.getfId())) {
 | 
	
		
			
				|  |  |              return UserConstants.NOT_UNIQUE;
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          return UserConstants.UNIQUE;
 | 
	
	
		
			
				|  | @@ -790,7 +790,7 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
 | 
	
		
			
				|  |  |      @Override
 | 
	
		
			
				|  |  |      public String checkUFAaddrUnique(TWarehouse tWarehouse) {
 | 
	
		
			
				|  |  |          TWarehouse tWarehouse1 = tWarehouseMapper.checkUFAaddrUnique(tWarehouse.getfAddr());
 | 
	
		
			
				|  |  | -        if (StringUtils.isNotNull(tWarehouse1) && tWarehouse1.getfId() != tWarehouse.getfId()) {
 | 
	
		
			
				|  |  | +        if (StringUtils.isNotNull(tWarehouse1) && !tWarehouse1.getfId().equals(tWarehouse.getfId())) {
 | 
	
		
			
				|  |  |              return UserConstants.NOT_UNIQUE;
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          return UserConstants.UNIQUE;
 | 
	
	
		
			
				|  | @@ -799,7 +799,7 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
 | 
	
		
			
				|  |  |      @Override
 | 
	
		
			
				|  |  |      public String checkUFTWarehouseAreaNoUnique(TWarehouseArea tWarehouseAreas) {
 | 
	
		
			
				|  |  |          TWarehouseArea tWarehouseAreas1 = tWarehouseAreaMapper.checkFNoUnique(tWarehouseAreas.getfNo(), tWarehouseAreas.getfWarehouseid());
 | 
	
		
			
				|  |  | -        if (StringUtils.isNotNull(tWarehouseAreas1) && tWarehouseAreas1.getfId() != tWarehouseAreas.getfId()) {
 | 
	
		
			
				|  |  | +        if (StringUtils.isNotNull(tWarehouseAreas1) && !tWarehouseAreas1.getfId().equals(tWarehouseAreas.getfId())) {
 | 
	
		
			
				|  |  |              return UserConstants.NOT_UNIQUE;
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          return UserConstants.UNIQUE;
 | 
	
	
		
			
				|  | @@ -808,7 +808,7 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
 | 
	
		
			
				|  |  |      @Override
 | 
	
		
			
				|  |  |      public String checkUTWarehouseAreaFNnameUnique(TWarehouseArea tWarehouseAreas) {
 | 
	
		
			
				|  |  |          TWarehouseArea tWarehouseAreas1 = tWarehouseAreaMapper.checkUFNnameUnique(tWarehouseAreas.getfName(), tWarehouseAreas.getfWarehouseid());
 | 
	
		
			
				|  |  | -        if (StringUtils.isNotNull(tWarehouseAreas1) && tWarehouseAreas1.getfId() != tWarehouseAreas.getfId()) {
 | 
	
		
			
				|  |  | +        if (StringUtils.isNotNull(tWarehouseAreas1) && !tWarehouseAreas1.getfId().equals(tWarehouseAreas.getfId())) {
 | 
	
		
			
				|  |  |              return UserConstants.NOT_UNIQUE;
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          return UserConstants.UNIQUE;
 |