From fd5f5f8e45e5e4195694e34b6f7bf481e85bcabc Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 12 May 2021 11:40:09 +0800
Subject: [PATCH] 设备新增逻辑调整

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
index 4573380..688f5f9 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
@@ -388,8 +388,8 @@
 			equipment.setHeartbeat(null);
 		}
 
-		if (equipment.getJtype() != null && equipment.getJtype().equals("")) {
-			equipment.setJtype("0");
+		if (equipment.getDtype() == null || equipment.getDtype().equals("")) {
+			equipment.setDtype("0");
 		}
 
 		//判断省市区的值是否为数字或者中文字符串
@@ -437,8 +437,8 @@
 			equipment.setHeartbeat(null);
 		}
 
-		if (equipment.getJtype() != null && equipment.getJtype().equals("")) {
-			equipment.setJtype("0");
+		if (equipment.getDtype() == null || equipment.getDtype().equals("")) {
+			equipment.setDtype("0");
 		}
 
 //		String deviceName = equipment.getDeviceName();

--
Gitblit v1.9.3