根据测试反馈，处理关于审批流的问题

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

@@ -92,7 +92,6 @@ public class AddMeetTaskActivity extends BaseActivity {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (data == null) return;
         if (requestCode == 0x11 && resultCode == 0x20) {
             if (!isPower)
                 handler.postDelayed(new Runnable() {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddErpActivity.java

@@ -50,7 +50,7 @@ import java.util.Map;
  * Created by FANGlh on 2017/3/30.
  * function:erp添加任务界面同步于b2b任务添加界面
  */
-public class TaskAddErpActivity extends BaseActivity implements View.OnClickListener,RecognizerDialogListener {
+public class TaskAddErpActivity extends BaseActivity implements View.OnClickListener, RecognizerDialogListener {
     private static final int TASK_ADD_ERP = 0x330;
     @ViewInject(R.id.et_title)
     private EditText et_title;
@@ -119,7 +119,7 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
         voice_search_iv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                RecognizerDialogUtil.showRecognizerDialog(ct,TaskAddErpActivity.this);
+                RecognizerDialogUtil.showRecognizerDialog(ct, TaskAddErpActivity.this);
             }
         });
     }
@@ -131,12 +131,12 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
 //                CommonUtil.showDateDialog(mContext, v);
 //                showDateDialog(this, et_startime);
 
-                startActivityForResult(new Intent(mContext,SelectCalendarActivity.class)
+                startActivityForResult(new Intent(mContext, SelectCalendarActivity.class)
                                 .putExtra("startDate", et_startime.getText().toString())
                                 .putExtra("endDate", et_endtime.getText().toString())
-                                .putExtra("hasMenu",false)
+                                .putExtra("hasMenu", false)
                                 .putExtra("caller", "Workovertime")
-                        ,0x30);
+                        , 0x30);
                 break;
             case R.id.iv_find:
                 Intent intent = new Intent(ct, SelectCollisionActivity.class);
@@ -151,12 +151,12 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
             case R.id.et_endtime:
 //                showDateDialog(this, et_endtime);
 
-                startActivityForResult(new Intent(mContext,SelectCalendarActivity.class)
+                startActivityForResult(new Intent(mContext, SelectCalendarActivity.class)
                                 .putExtra("startDate", et_startime.getText().toString())
                                 .putExtra("endDate", et_endtime.getText().toString())
-                                .putExtra("hasMenu",false)
+                                .putExtra("hasMenu", false)
                                 .putExtra("caller", "Workovertime")
-                        ,0x30);
+                        , 0x30);
                 break;
             default:
                 break;
@@ -218,9 +218,9 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
                 break;
         }
 
-        if (requestCode == 0x30 && resultCode == 0x11){
-            String startDate=data.getStringExtra("startDate");
-            String endDate=data.getStringExtra("endDate");
+        if (requestCode == 0x30 && resultCode == 0x11) {
+            String startDate = data.getStringExtra("startDate");
+            String endDate = data.getStringExtra("endDate");
 //            startDate=startDate+":00";
 //            endDate=endDate+":00";
             et_startime.setText(startDate);
@@ -340,6 +340,7 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
                         Log.i("task_erp_result", task_erp_result + "");
                         if (JSON.parseObject(task_erp_result).containsKey("success") && JSON.parseObject(task_erp_result).getBoolean("success")) {
                             Toast.makeText(mContext, getString(R.string.task_send_success), Toast.LENGTH_LONG).show();
+                            setResult(0x20, null);
                             finish();
                         }
                     }