diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/CJFragment.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/CJFragment.java
index 91968fa..0103e05 100755
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/CJFragment.java
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/CJFragment.java
@@ -492,7 +492,10 @@ public class CJFragment extends BaseFragment {
     }
 
     public boolean getEditTextFxIsShow() {
-        return llFxnr.getVisibility()==View.VISIBLE;
+        if(llFxnr!=null){
+            return llFxnr.getVisibility()==View.VISIBLE;
+        }
+        return false;
     }
 
     public String getEditTextFxContent() {
diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/WjFragment.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/WjFragment.java
index 330900c..7761e63 100755
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/WjFragment.java
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/WjFragment.java
@@ -150,21 +150,24 @@ public class WjFragment extends BaseFragment {
     }
 
     private void initDlbinfo() {
-
-        for (int i = 0; i < rwqys.size(); i++) {
-            DlbInfo info = new DlbInfo();
-            info.setXh(i + 1);
-            //info.setDian(rwqys.get(i).getPOINTNAME() + "(" + rwqys.get(i).getDESCRIPTION() + ")");
-            info.setDian(rwqys.get(i).getDESCRIPTION() + "(" + rwqys.get(i).getPOINTNAME() + ")");
-            info.setStatu(rwqys.get(i).isChecked());
-            info.setCjjg(rwqys.get(i).getCJJG());
-            list.add(info);
+        if(rwqys!=null&&rwqys.size()>0){
+            for (int i = 0; i < rwqys.size(); i++) {
+                DlbInfo info = new DlbInfo();
+                info.setXh(i + 1);
+                //info.setDian(rwqys.get(i).getPOINTNAME() + "(" + rwqys.get(i).getDESCRIPTION() + ")");
+                info.setDian(rwqys.get(i).getDESCRIPTION() + "(" + rwqys.get(i).getPOINTNAME() + ")");
+                info.setStatu(rwqys.get(i).isChecked());
+                info.setCjjg(rwqys.get(i).getCJJG());
+                list.add(info);
+            }
         }
     }
 
     public void setListadapter() {
         list.clear();
         initDlbinfo();
-        adapter.notifyDataSetChanged();
+        if(adapter!=null){
+            adapter.notifyDataSetChanged();
+        }
     }
 }