预约提交时，昵称为空不允许提交

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/ClientActivity.java

@@ -245,7 +245,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         initSaleBarChart();
         initListener();
         mMonths = getResources().getStringArray(R.array.month_list);
-        sales=getResources().getStringArray(R.array.sale_list);
+        sales = getResources().getStringArray(R.array.sale_list);
     }
 
     private void initListener() {
@@ -489,7 +489,10 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_crm, menu);
+        String master = CommonUtil.getMaster();
+        if (!("DATACENTER".equals(master) || "N_SHYZ".equals(master) || "N_AJC".equals(master))) {
+            getMenuInflater().inflate(R.menu.menu_crm, menu);
+        }
         return true;
     }
 
@@ -579,7 +582,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
     private void setData1(int count, float[] ydata) {
         ArrayList<String> xVals = new ArrayList<String>();
-        String[] sale_list= getResources().getStringArray(R.array.sale_list);
+        String[] sale_list = getResources().getStringArray(R.array.sale_list);
         xVals.add(sale_list[0]);
         xVals.add(sale_list[2]);
         xVals.add(sale_list[4]);

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

@@ -882,8 +882,11 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
             list.add(map);
             map = new HashMap<>();
         }
-        map.put("item_name", getString(R.string.crm_add_visitrecord));
-        list.add(map);
+        String master = CommonUtil.getMaster();
+        if (!("DATACENTER".equals(master) || "N_SHYZ".equals(master) || "N_AJC".equals(master))) {
+            map.put("item_name", getString(R.string.crm_add_visitrecord));
+            list.add(map);
+        }
         if (menusMap != null) {
             if (menusMap.size() != 0) {
                 for (int i = 0; i < menusMap.size(); i++) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingAddActivity.java

@@ -304,6 +304,11 @@ public class BookingAddActivity extends SupportToolBarActivity implements View.O
             bt_commit.setEnabled(true);
             return;
         }
+
+        if (StringUtil.isEmpty(com.core.utils.CommonUtil.getName())) {
+            ToastMessage("当前登录人姓名为空，不能新增预约");
+            return;
+        }
 //        showLoading();
         String content = "";
         content = et_book_content.getText().toString();
@@ -418,10 +423,10 @@ public class BookingAddActivity extends SupportToolBarActivity implements View.O
                             } else {
                                 invite(phone, "8636ba7f-a1b4-4062-8571-782035101167");
                             }
-                            if (!TextUtils.isEmpty(mWhichPage)&&mWhichPage.equals("ScheduleActivity")){
+                            if (!TextUtils.isEmpty(mWhichPage) && mWhichPage.equals("ScheduleActivity")) {
                                 setResult(0x11);
                                 finish();
-                            }else{
+                            } else {
                                 startActivity(new Intent(BookingAddActivity.this, BookingListActivity.class)
                                         .putExtra("curDate", startTime)
                                         .putExtra("whichPage", mWhichPage));