Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_raomeng

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/CustomerContactDetailActivity.java

@@ -64,10 +64,9 @@ public class CustomerContactDetailActivity extends BillDetailsActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (com.modular.apputils.R.id.edit == item.getItemId()) {
-            HashMap<String, String> dbfindCondition = null;
-            dbfindCondition = new HashMap<>();
+            HashMap<String, String> dbfindCondition = new HashMap<>();
             dbfindCondition.put("cu_code", "cu_sellercode='" + CommonUtil.getEmcode() + "'");
-            String  mCaller = "Contact";
+            String mCaller = "Contact";
             String mTitle = "客户联系人";
             Class clazz = CustomerContactActivity.class;
             startActivity(new Intent(ct, clazz)
@@ -76,8 +75,10 @@ public class CustomerContactDetailActivity extends BillDetailsActivity {
                     .putExtra(Constants.Intents.ID, mBillDetailsPresenter.getId())
                     .putExtra(Constants.Intents.MY_DOIT, true)
                     .putExtra(Constants.Intents.DB_FIND_CONDITION, dbfindCondition));
+            return true;
+        } else {
+            return super.onOptionsItemSelected(item);
         }
-        return super.onOptionsItemSelected(item);
     }
 
     @Override