审批详情master账套问题

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Jan 11 19:41:29 CST 2019
+#Mon Jan 28 20:19:03 CST 2019
 debugName=971
-versionName=664
+versionName=666
 debugCode=971
-versionCode=219
+versionCode=221

app_modular/appmessages/src/main/java/com/modular/appmessages/fragment/ApprovalListFragment.java

@@ -229,6 +229,8 @@ public class ApprovalListFragment extends ViewPagerLazyFragment implements OnSma
                     e.setNodeDealMan(JSONUtil.getText(object, "JP_NODEDEALMANNAME"));
                     e.setLauncherCode(JSONUtil.getText(object, "JP_LAUNCHERID"));
                     e.setOperatedDescription(JSONUtil.getText(object, "JN_OPERATEDDESCRIPTION"));
+                    e.setJp_form(JSONUtil.getText(object, "JP_FORM"));
+
                     approvalLists.add(setSubTitle(e));
                 }
             }
@@ -328,7 +330,13 @@ public class ApprovalListFragment extends ViewPagerLazyFragment implements OnSma
                 intent.putExtra("imid", model.getImid());
                 intent.putExtra("title", title);
                 intent.putExtra("type", tabItem);
-                intent.putExtra("master", model.getMaster());
+                String jp_form = model.getJp_form();
+                String master = model.getMaster();
+                if (!TextUtils.isEmpty(jp_form) && !TextUtils.isEmpty(master) && jp_form.contains(master)) {
+                    intent.putExtra("master", model.getMaster());
+                } else {
+                    intent.putExtra("master", CommonUtil.getMaster());
+                }
                 intent.putExtra("nodeid", Integer.valueOf(model.getNodeId()));
                 startActivity(intent);
             }

app_modular/apputils/src/main/java/com/modular/apputils/model/ApprovalList.java

@@ -18,7 +18,8 @@ public class ApprovalList {
     private String operatedDescription;//变更处理人
     private int subTitleColor;
     private String subTitle;
-    private String  codeValue;
+    private String codeValue;
+    private String jp_form;
 
     public String getCodeValue() {
         return codeValue;
@@ -148,7 +149,13 @@ public class ApprovalList {
         this.operatedDescription = operatedDescription;
     }
 
+    public String getJp_form() {
+        return jp_form;
+    }
 
+    public void setJp_form(String jp_form) {
+        this.jp_form = jp_form;
+    }
 
     public boolean hasContext(CharSequence constraint) {
         return contain(constraint, imid, nodeId, caller, keyValue, master, name,