diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
index 8004e83eb..7ad31182f 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
@@ -258,34 +258,30 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
 		PileStationInfo queryStationInfo = selectPileStationInfoById(pileStationInfo.getId());
 		String oldMerchantId = String.valueOf(queryStationInfo.getMerchantId());
 		String newMerchantId = String.valueOf(pileStationInfo.getMerchantId());
-		if (!StringUtils.equals("null", newMerchantId)) {
-
-			// 对比一下运营商有没有变化
-			if (!StringUtils.equals(oldMerchantId, newMerchantId)) {
-				// 新旧运营商不一致，执行站点更换运营商逻辑
-				stationUpdateMerchant(pileStationInfo, newMerchantId);
-			} else {
-				// 查询部门
-				SysDept sysDept = sysDeptService.selectDeptById(Long.parseLong(pileStationInfo.getDeptId()));
-				// 同步组织中的名称，联系人，电话
-				if (sysDept != null) {
-					sysDept.setDeptName(pileStationInfo.getStationName());
-					sysDept.setLeader(pileStationInfo.getStationAdminName());
-					sysDept.setPhone(pileStationInfo.getStationTel());
-					sysDept.setUpdateTime(DateUtils.getNowDate());
-					sysDeptService.updateDept(sysDept);
-				}
+		// 对比一下运营商有没有变化
+		if (!StringUtils.equals(oldMerchantId, newMerchantId)) {
+			// 新旧运营商不一致，执行站点更换运营商逻辑
+			stationUpdateMerchant(pileStationInfo, newMerchantId);
+		} else {
+			// 查询部门
+			SysDept sysDept = sysDeptService.selectDeptById(Long.parseLong(pileStationInfo.getDeptId()));
+			// 同步组织中的名称，联系人，电话
+			if (sysDept != null) {
+				sysDept.setDeptName(pileStationInfo.getStationName());
+				sysDept.setLeader(pileStationInfo.getStationAdminName());
+				sysDept.setPhone(pileStationInfo.getStationTel());
+				sysDept.setUpdateTime(DateUtils.getNowDate());
+				sysDeptService.updateDept(sysDept);
 			}
-
-			pileStationInfo.setUpdateBy(SecurityUtils.getUsername());
-			pileStationInfo.setUpdateTime(DateUtils.getNowDate());
-			int i = pileStationInfoMapper.updatePileStationInfo(pileStationInfo);
-
-			// 再次清缓存
-			redisCache.deleteObject(redisKey);
-			return i;
 		}
-		return 0;
+
+		pileStationInfo.setUpdateBy(SecurityUtils.getUsername());
+		pileStationInfo.setUpdateTime(DateUtils.getNowDate());
+		int i = pileStationInfoMapper.updatePileStationInfo(pileStationInfo);
+
+		// 再次清缓存
+		redisCache.deleteObject(redisKey);
+		return i;
 	}
 
 	/**