更改

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/MeetUserEntity.java

@@ -10,39 +10,12 @@ public class MeetUserEntity implements Parcelable {
     private String imId;
     private String name;
     private String emCode;
-    private boolean isClick=false;
+    private int emId;
+    private boolean isClick = false;
 
     public MeetUserEntity() {
     }
 
-
-    protected MeetUserEntity(Parcel in) {
-        imId = in.readString();
-        name = in.readString();
-        emCode = in.readString();
-        isClick = in.readByte() != 0;
-    }
-
-    public static final Creator<MeetUserEntity> CREATOR = new Creator<MeetUserEntity>() {
-        @Override
-        public MeetUserEntity createFromParcel(Parcel in) {
-            return new MeetUserEntity(in);
-        }
-
-        @Override
-        public MeetUserEntity[] newArray(int size) {
-            return new MeetUserEntity[size];
-        }
-    };
-
-    public boolean isClick() {
-        return isClick;
-    }
-
-    public void setClick(boolean click) {
-        isClick = click;
-    }
-
     public String getImId() {
         return imId;
     }
@@ -67,6 +40,42 @@ public class MeetUserEntity implements Parcelable {
         this.emCode = emCode;
     }
 
+    public int getEmId() {
+        return emId;
+    }
+
+    public void setEmId(int emId) {
+        this.emId = emId;
+    }
+
+    public boolean isClick() {
+        return isClick;
+    }
+
+    public void setClick(boolean click) {
+        isClick = click;
+    }
+
+    protected MeetUserEntity(Parcel in) {
+        imId = in.readString();
+        name = in.readString();
+        emCode = in.readString();
+        emId = in.readInt();
+        isClick = in.readByte() != 0;
+    }
+
+    public static final Creator<MeetUserEntity> CREATOR = new Creator<MeetUserEntity>() {
+        @Override
+        public MeetUserEntity createFromParcel(Parcel in) {
+            return new MeetUserEntity(in);
+        }
+
+        @Override
+        public MeetUserEntity[] newArray(int size) {
+            return new MeetUserEntity[size];
+        }
+    };
+
     @Override
     public int describeContents() {
         return 0;
@@ -74,12 +83,10 @@ public class MeetUserEntity implements Parcelable {
 
     @Override
     public void writeToParcel(Parcel parcel, int i) {
-
         parcel.writeString(imId);
         parcel.writeString(name);
         parcel.writeString(emCode);
+        parcel.writeInt(emId);
         parcel.writeByte((byte) (isClick ? 1 : 0));
     }
-
-
 }

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

@@ -228,10 +228,10 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         for (int i = 0; i < entities.size(); i++) {
             if (i == 0) {
                 builder.append(entities.get(i).getName());
-                builderId.append("employee#" + entities.get(i).getImId());
+                builderId.append("employee#" + entities.get(i).getEmId());
             } else {
                 builder.append(";" + entities.get(i).getName());
-                builderId.append(";employee#" + entities.get(i).getImId());
+                builderId.append(";employee#" + entities.get(i).getEmId());
             }
         }
         doSignin(builder.toString(), builderId.toString(), code);

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

@@ -85,6 +85,8 @@ public class MeetingActivity extends BaseActivity {
         if (entities == null)
             entities = listdata;
         else entities.addAll(listdata);
+        adapter = new MesstingAdapter();
+        list_business.getRefreshableView().setAdapter(adapter);
         adapter.setData(entities);
     }
 
@@ -101,8 +103,7 @@ public class MeetingActivity extends BaseActivity {
 
     private void initView() {
         list_business.setEmptyView(R.layout.view_empty);
-        adapter = new MesstingAdapter();
-        list_business.getRefreshableView().setAdapter(adapter);
+
         progressDialog.show();
         loadNetData(basePager);
     }

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

@@ -430,7 +430,13 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 List<OABean> beans = new ArrayList<>();
                 try {// meBeans : otherBeans 可能为空
 //                    for (OABean e : (tag == 1 ? meBeans : otherBeans)) {
-                    for (OABean e : adapter.getBeans() == null ? new ArrayList<OABean>() : adapter.getBeans()) {
+                    List<OABean> b;
+                    if (tag == 1) {
+                        b = meBeans == null ? new ArrayList<OABean>() : meBeans;
+                    } else {
+                        b = otherBeans == null ? new ArrayList<OABean>() : otherBeans;
+                    }
+                    for (OABean e : b) {
                         if (e.getStartdate() == null) continue;
                         c.setTimeInMillis(TimeUtils.f_str_2_long(e.getStartdate()));
                         int day = c.get(Calendar.DAY_OF_MONTH);

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

@@ -230,6 +230,7 @@ public class UserSelectActivity extends BaseActivity {
                 "whichsys=?");
         for (int i = 0; i < emList.size(); i++) {//企业通讯人员
             if (emList.get(i).getEm_IMID() == 0) continue;
+
             entities.add(EnterChatAction(emList.get(i)));
         }
         //获取完数据以后
@@ -254,6 +255,7 @@ public class UserSelectActivity extends BaseActivity {
         entity.setImId(String.valueOf(employee.getEm_IMID()));
         entity.setName(employee.getEM_NAME());
         entity.setEmCode(employee.getEM_CODE());
+        entity.setEmId(employee.getEM_ID());
         return entity;
     }