不传DeviceSubType参数mac返回''

Controller/SerialNumberController.py

@@ -192,9 +192,10 @@ class SerialNumberView(View):
                                 MacModel.objects.filter().update(value=temp_mac, update_time=now_time)  # 更新mac表的mac地址值
                             else:
                                 MacModel.objects.filter().update(is_active=False, update_time=now_time)
-                        result = UIDModel.objects.filter(id=uid.id, status=0).\
-                            update(status=2, update_time=now_time)
+                        else:
+                            current_mac = ''
 
+                        result = UIDModel.objects.filter(id=uid.id, status=0).update(status=2, update_time=now_time)
                         if int(result) <= 0:    # 更新失败
                             count += 1
                             continue

Service/CommonService.py

@@ -253,6 +253,8 @@ class CommonService:
 
     @staticmethod
     def decode_data(content, start=1, end=4):
+        if not content:
+            return ''
         try:
             for i in range(start, end):
                 if i == 1:
@@ -275,6 +277,8 @@ class CommonService:
 
     @staticmethod
     def encode_data(content, start=1, end=4):
+        if not content:
+            return ''
         for i in range(start, end):
             if i == 1:
                 content = RandomStr(3, False)+content+RandomStr(3, False)