pageSize=1000

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/ExpenseReimbursementActivity.java

@@ -1924,16 +1924,25 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
                     .putExtra("title", getSupportActionBar().getTitle().toString()));
         }
         if (item.getItemId() == android.R.id.home){
-            startActivity(new Intent(ExpenseReimbursementActivity.this, OAActivity.class)
-                    .putExtra("WorkDailyAdd", "WorkDailyAdd"));
+            if (formid == 0){
+               finish();
+            }else{
+                startActivity(new Intent(ExpenseReimbursementActivity.this, OAActivity.class)
+                        .putExtra("WorkDailyAdd", "WorkDailyAdd"));
+            }
+
         }
         return super.onOptionsItemSelected(item);
     }
 
     @Override
     public void onBackPressed() {
-        startActivity(new Intent(ExpenseReimbursementActivity.this, OAActivity.class)
-                .putExtra("WorkDailyAdd", "WorkDailyAdd"));
+        if (formid == 0){
+            finish();
+        }else {
+            startActivity(new Intent(ExpenseReimbursementActivity.this, OAActivity.class)
+                    .putExtra("WorkDailyAdd", "WorkDailyAdd"));
+        }
         super.onBackPressed();
     }