代码冲突

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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java
#	app_core/common/src/main/java/com/common/data/StringUtil.java

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingAddActivity.java

@@ -240,11 +240,13 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
                         phones.append(models.get(i).getPhone() + ",");
                     }
                 }
+                //根据手机号进行公司查询
                 comboxGetCompany(phones.toString());
                 if (StringUtil.isEmpty(tvBookObject.getText().toString())){
                     tvBookObject.setText(names.toString());
                 }else{
-                    tvBookObject.setText(tvBookObject.getText().toString()+","+names.toString());
+                    tvBookObject.setText(names.toString());
+                  //  tvBookObject.setText(tvBookObject.getText().toString()+","+names.toString());
                 }
                 break;
             case 0x02://企业
@@ -446,48 +448,52 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
                 .build(), new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
             public void onResponse(Object o) {
-                LogUtil.d("ResponseText", "o:" + o.toString());
-                if (JSONUtil.validate(o.toString())) {
-                    JSONArray datas = JSON.parseObject(o.toString()).getJSONArray("listdata");
-                    if (!ListUtils.isEmpty(datas)) {
-                        StringBuilder companyBuilder = new StringBuilder("");
-                        StringBuilder imidBuilder = new StringBuilder("");
-                        StringBuilder phoneBuilder = new StringBuilder("");
-                        StringBuilder nameBuilder = new StringBuilder("");
-                        for (int i = 0; i < datas.size(); i++) {
-                            JSONObject object = datas.getJSONObject(i);
-                            if (i == datas.size() - 1) {
-                                companyBuilder.append(object.getString("company"));
-                                imidBuilder.append(StringUtil.isEmpty(object.getString("imid"))==true?"0":object.getString("imid"));
-                                phoneBuilder.append(object.getString("usertel"));
-                                nameBuilder.append(object.getString("username"));
-                            } else {
-                                companyBuilder.append(object.getString("company") + ",");
-                                if(StringUtil.isEmpty(object.getString("imid"))){
-                                    imidBuilder.append("0" + ",");
-                                }else{
-                                    imidBuilder.append(object.getString("imid") + ",");
+                try {
+                    LogUtil.d("ResponseText", "o:" + o.toString());
+                    if (JSONUtil.validate(o.toString())) {
+                        JSONArray datas = JSON.parseObject(o.toString()).getJSONArray("listdata");
+                        if (!ListUtils.isEmpty(datas)) {
+                            StringBuilder companyBuilder = new StringBuilder("");
+                            StringBuilder imidBuilder = new StringBuilder("");
+                            StringBuilder phoneBuilder = new StringBuilder("");
+                            StringBuilder nameBuilder = new StringBuilder("");
+                            for (int i = 0; i < datas.size(); i++) {
+                                JSONObject object = datas.getJSONObject(i);
+                                if (i == datas.size() - 1) {
+                                    companyBuilder.append(object.getString("company"));
+                                    imidBuilder.append(StringUtil.isEmpty(object.getString("imid"))==true?"0":object.getString("imid"));
+                                    phoneBuilder.append(object.getString("usertel"));
+                                    nameBuilder.append(object.getString("username"));
+                                } else {
+                                    companyBuilder.append(object.getString("company") + ",");
+                                    if(StringUtil.isEmpty(object.getString("imid"))){
+                                        imidBuilder.append("0" + ",");
+                                    }else{
+                                        imidBuilder.append(object.getString("imid") + ",");
+                                    }
+                                    phoneBuilder.append(object.getString("usertel") + ",");
+                                    nameBuilder.append(object.getString("username") + ",");
                                 }
-                                phoneBuilder.append(object.getString("usertel") + ",");
-                                nameBuilder.append(object.getString("username") + ",");
                             }
+                            
+//                            if (StringUtil.isEmpty(tv_book_company.getText().toString())){
+                                tv_book_company.setText(companyBuilder.toString());
+                                imId = imidBuilder.toString();
+                                phone = phoneBuilder.toString();
+//                            }else{
+//                                tv_book_company.setText(tv_book_company.getText().toString()+","+companyBuilder.toString());
+//                                imId =imId+","+ imidBuilder.toString();
+//                                phone = phone+","+phoneBuilder.toString();
+//                                imId= imId.replace("null","");
+//                                phone = phone.replace("null","");
+//                            }
+                            
+         
                         }
-                        
-                        if (StringUtil.isEmpty(tv_book_company.getText().toString())){
-                            tv_book_company.setText(companyBuilder.toString());
-                            imId = imidBuilder.toString();
-                            phone = phoneBuilder.toString();
-                        }else{
-                            tv_book_company.setText(tv_book_company.getText().toString()+","+companyBuilder.toString());
-                            imId =imId+","+ imidBuilder.toString();
-                            phone = phone+","+phoneBuilder.toString();
-                            imId= imId.replace("null","");
-                            phone = phone.replace("null","");
-                        }
-                        
-     
+    
                     }
-
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
             }
         }));