Bitliker 9 лет назад
Родитель
Сommit
87f887deb7

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/TaskAddActivity.java

@@ -25,7 +25,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
-import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
@@ -390,6 +389,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
             case R.id.tv_executive:
                 Intent intent = new Intent(ct, UserSelectActivity.class);
                 intent.putExtra("single", false);
+                intent.putExtra("isme", true);
                 startActivityForResult(intent, 0x11);
                 break;
         }

+ 3 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/UserSelectActivity.java

@@ -134,6 +134,7 @@ public class UserSelectActivity extends BaseActivity {
             @Override
             public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
             }
+
             @Override
             public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
             }
@@ -185,6 +186,7 @@ public class UserSelectActivity extends BaseActivity {
     }
 
     private void selectOK() {
+        boolean isme = getIntent().getBooleanExtra("isme", false);
         //选择人员成功操作
         ArrayList<Employees> list = new ArrayList<>();
         if (adapter == null || adapter.getUsers() == null || adapter.getUsers().size() <= 0) {
@@ -193,7 +195,7 @@ public class UserSelectActivity extends BaseActivity {
         }
         String name = CommonUtil.getSharedPreferences(ct, "erp_username");
         for (int i = 0; i < adapter.getUsers().size(); i++) {
-            if (!StringUtils.isEmpty(name) && name.equals(adapter.getUsers().get(i).getEm_code())) {
+            if (!isme && !StringUtils.isEmpty(name) && name.equals(adapter.getUsers().get(i).getEm_code())) {
                 list.add(adapter.getUsers().get(i));
                 continue;
             }