diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/QrCodeActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/QrCodeActivity.kt
index 9d52a34..5296ec7 100644
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/QrCodeActivity.kt
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/QrCodeActivity.kt
@@ -149,7 +149,7 @@ class QrCodeActivity : BaseActivityOaToolbarViewBinding<ActivityQrCodeBinding>()
             sb.append(it)
             //sb.append("\n")
         }
-        intentToResult(sb.toString())
+        intentToResult(sb.toString().trim())
     }
 
     private fun intentToResult(result: String) {
diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SdjgzActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SdjgzActivity.java
index 965bfad..b3831aa 100644
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SdjgzActivity.java
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SdjgzActivity.java
@@ -441,7 +441,7 @@ public class SdjgzActivity extends BaseActivity {
         //super.handleNfc(result);
         //tvNodata.setText(result);
         //result = "04D49CEAC21B90";
-        if (list.size() != 0) {
+        if (!list.isEmpty()) {
             showLog("--------");
             showLog(GsonUtils.GsonString(list));
             ArrayList<DjjhRwQy> rwqyTemp = new ArrayList<>();