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

app_modular/apputils/src/main/java/com/modular/apputils/activity/SelectNetAcitivty.java

@@ -64,6 +64,7 @@ public class SelectNetAcitivty extends OABaseActivity {
 
     private PullToRefreshListView refreshListView;
     private EmptyLayout mEmptyLayout;
+    private int groupId;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -133,6 +134,7 @@ public class SelectNetAcitivty extends OABaseActivity {
             dataForm = intent.getBooleanExtra("dataForm", false);
             corekey = intent.getStringExtra("corekey");
             isDevice = intent.getBooleanExtra("isDevice", false);
+            groupId=intent.getIntExtra("groupId",0);
         }
         VoiceSearchView voiceSearchView = (VoiceSearchView) findViewById(R.id.voiceSearchView);
         refreshListView = (PullToRefreshListView) findViewById(R.id.refreshListView);
@@ -357,7 +359,7 @@ public class SelectNetAcitivty extends OABaseActivity {
                 public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
                     if (mAdapter != null) {
                         Bean model = mAdapter.getModels((int) l);
-                        setResult(90, new Intent().putExtra("data", model.json));
+                        setResult(90, new Intent().putExtra("data", model.json).putExtra("groupId",groupId));
                         finish();
 
                     }

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/DataFormDetailActivity.java

@@ -1143,12 +1143,14 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                 isLeave = true;
                             }
                             if (data.getType().equals("SF")) {
+                                LogUtil.d(TAG,"GroupId:"+data.getGroupId());
                                 startActivityForResult(new Intent(ct, SelectNetAcitivty.class)
                                                 .putExtra("fieldKey", data.getField())
                                                 .putExtra("caller", caller)
-                                                .putExtra("isDevice", true)
+                                                .putExtra("isDevice", false)
                                                 .putExtra("device", data.getName().equals("设备编号"))
                                                 .putExtra("isForm", true)
+                                                .putExtra("groupId",data.getGroupId())
                                         , 90);
                                 isLeave = true;
                             } else if (data.getType().equals("MF")) {
@@ -1536,9 +1538,10 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
 
         if (90 == requestCode && data != null) {
             String json = data.getStringExtra("data");
-            LogUtil.d("DataFormDetailActivity", "json=" + json);
+            int groupId=data.getIntExtra("groupId",0);
+            LogUtil.d("DataFormDetailActivity", "json=" + json+" groupId："+groupId);
             try {
-                paseSelectDbFind(JSON.parseObject(json));
+                paseSelectDbFind(JSON.parseObject(json),groupId);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -1556,8 +1559,12 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
         super.onDestroy();
     }
 
-    private void paseSelectDbFind(JSONObject object) throws Exception {
-        List<Data> tempLists = mAdapter.getmListData().get(0).getDatas();
+    private void paseSelectDbFind(JSONObject object ,int groupId) throws Exception {
+        List<Data> tempLists = mAdapter.getmListData().get(groupId).getDatas();
+        LogUtil.d(TAG,"object:"+object.toJSONString());
+        LogUtil.d(TAG,"tempLists1:"+JSON.toJSONString(tempLists));
+        LogUtil.d(TAG,"tempLists2:"+JSON.toJSONString(mDatas.get(0).getDatas()));
+        LogUtil.prinlnLongMsg(TAG,"tempLists3:"+JSON.toJSONString(mDatas));
         if (!ListUtils.isEmpty(tempLists) && object != null && !object.isEmpty()) {
             for (Data e : tempLists) {
                 if (object.containsKey(e.getField())) {