baibx пре 3 месеци
родитељ
комит
88c87937a4

+ 2 - 2
com.sharemao.web.appserver/src/main/java/com/sharemao/app/service/impl/PackageServiceImpl.java

@@ -1393,7 +1393,7 @@ public class PackageServiceImpl extends AppBaseService implements PackageService
1393
 			String areaid = para.get("areaid");
1393
 			String areaid = para.get("areaid");
1394
 			String orgid = para.get("oid");
1394
 			String orgid = para.get("oid");
1395
 			String devid = para.get("devid");
1395
 			String devid = para.get("devid");
1396
-			if(Tools.isEmpty(devid))
1396
+			if(Tools.isEmpty(devid) || "null".equals(devid))
1397
 			{
1397
 			{
1398
 				record.put("code", 9);
1398
 				record.put("code", 9);
1399
 				record.put("msg", "设备编号不能为空");
1399
 				record.put("msg", "设备编号不能为空");
@@ -1507,7 +1507,7 @@ public class PackageServiceImpl extends AppBaseService implements PackageService
1507
 			String areaid = para.get("areaid");
1507
 			String areaid = para.get("areaid");
1508
 			String orgid = para.get("oid");
1508
 			String orgid = para.get("oid");
1509
 			String devid = para.get("devid");
1509
 			String devid = para.get("devid");
1510
-			if(Tools.isEmpty(devid))
1510
+			if(Tools.isEmpty(devid) || "null".equals(devid))
1511
 			{
1511
 			{
1512
 				record.put("code", 9);
1512
 				record.put("code", 9);
1513
 				record.put("msg", "设备编号不能为空");
1513
 				record.put("msg", "设备编号不能为空");