Merge branch 'master' into wzbs

app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -1022,6 +1022,10 @@ object BusinessManager {
             if (!lockList.isNullOrEmpty()) {
                 bo.lockList = mutableListOf()
                 lockList.forEachIndexed { index, s ->
+                    if (s.isNullOrEmpty()) {
+                        LogUtil.w("Lock nfc is null or empty")
+                        return@forEachIndexed
+                    }
                     bo.lockList?.add(LockListBO(index + 1, s))
                 }
             }