CrashReport.putUserData

YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java

@@ -238,7 +238,6 @@ public class LoginActivity extends BaseActivity {
     }
 
     public void initData() {
-        CrashReport.putUserData(context, "UserName", UserID);
         onclick();
         String UserIDTemp = (String) SPUtils.get(LoginActivity.this, Contans.USERID, "");
         String username = RSAUtils.decryptBASE64StrLocal(UserIDTemp);
@@ -305,6 +304,7 @@ public class LoginActivity extends BaseActivity {
             if (!UserID.equals(etUse.getText().toString())) {
                 showToast("工号错误");
             } else {
+                CrashReport.putUserData(context, "UserName", UserID);
                 Intent intent = new Intent(LoginActivity.this, MainActivity.class);
                 startActivity(intent);
                 finish();
@@ -361,6 +361,7 @@ public class LoginActivity extends BaseActivity {
                             if (user != null && user.getUsername() != null) {
                                 String usernameLogin = UiUtlis.getText(etUse);
                                 if (usernameLogin != null && usernameLogin.equals(user.getUsername())) {
+                                    CrashReport.putUserData(context, "UserName", usernameLogin);
                                     SPUtils.put(LoginActivity.this, "save", savePwUser.isChecked());
                                     SPUtils.put(LoginActivity.this, Contans.USERID, RSAUtils.encryptBASE64StrLocal(etUse.getText().toString()));
                                     SPUtils.put(LoginActivity.this, Contans.USERPWD, RSAUtils.encryptBASE64StrLocal(etPwd.getText().toString()));

YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XzxsjhFragment.java

@@ -135,6 +135,9 @@ public class XzxsjhFragment extends BaseFragment {
         btnDelete = view.findViewById(R.id.btn_delete);
         LL = view.findViewById(R.id.LL);
 
+        String UserIDTemp = (String) SPUtils.get(context, Contans.USERID, "");
+        username = RSAUtils.decryptBASE64StrLocal(UserIDTemp);
+
         btnXz.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -222,8 +225,6 @@ public class XzxsjhFragment extends BaseFragment {
         });
         lv.addHeaderView(headView, null, false);
 
-        String UserIDTemp = (String) SPUtils.get(context, Contans.USERID, "");
-        username = RSAUtils.decryptBASE64StrLocal(UserIDTemp);
 
         String zyid = (String) SPUtils.get(context, Contans.ZY, "");
         if (zyid != null && (!zyid.equals(""))) {
@@ -250,6 +251,12 @@ public class XzxsjhFragment extends BaseFragment {
         dialog.setCancelable(false);
         cb.setChecked(false);
         xjjhs = new ArrayList<>();
+
+        if(TextUtils.isEmpty(username)){
+            String UserIDTemp = (String) SPUtils.get(context, Contans.USERID, "");
+            username = RSAUtils.decryptBASE64StrLocal(UserIDTemp);
+        }
+
         //如果数据库中有数据
         if (DataSupport.count("Xjjh") != 0) {
             List<Xjjh> xjjhListall = new ArrayList<>();
@@ -271,20 +278,38 @@ public class XzxsjhFragment extends BaseFragment {
                                     }
                                 }
                                 String inConditions = sb.toString();
+                                showLog(inConditions);
                                 //Log.i("app",inConditions);
+                                Log.i("app","zyid = "+inConditions);
+                                Log.i("app","download = 0");
+                                Log.i("app","mk = "+type==null?"null":type);
+                                Log.i("app","username = "+username==null?"null":username);
                                 xjjhListall = where(String.format("zyid in (%s) and download = ? and mk =? and username = ?", inConditions), "0", type, username).find(Xjjh.class);
                             } else {
+                                Log.i("app","download = 0");
+                                Log.i("app","mk = "+type==null?"null":type);
+                                Log.i("app","username = "+username==null?"null":username);
                                 xjjhListall = where("download = ? and mk = ? and username = ?", "0", type, username).find(Xjjh.class);
                             }
                         } else {
+                            Log.i("app","zyid = "+professionId==null?"null":professionId);
+                            Log.i("app","download = 0");
+                            Log.i("app","mk = "+type==null?"null":type);
+                            Log.i("app","username = "+username==null?"null":username);
                             //切换专业
                             xjjhListall = where("download = ? and mk = ? and zyid = ? and username = ?", "0", type, professionId, username).find(Xjjh.class);
                         }
                     }
                 } else {
+                    Log.i("app","download = 0");
+                    Log.i("app","mk = "+type==null?"null":type);
+                    Log.i("app","username = "+username==null?"null":username);
                     xjjhListall = where("download = ? and mk = ? and username = ?", "0", type, username).find(Xjjh.class);
                 }
             } else {
+                Log.i("app","download = 0");
+                Log.i("app","mk = "+type==null?"null":type);
+                Log.i("app","username = "+username==null?"null":username);
                 xjjhListall = where("download = ? and mk = ? and username = ?", "0", type, username).find(Xjjh.class);
             }