1.处理测试发现问题，并提交合并发布测试

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/ApprovaPresenter.java

@@ -81,14 +81,14 @@ public class ApprovaPresenter implements OnHttpResultListener {
         endActivity = false;
         if (intent != null) {
             int id = intent.getIntExtra("nodeid", -1);
-            String imid = intent.getStringExtra("imid");
+//            String imid = intent.getStringExtra("imid");
             title = intent.getStringExtra("title");
             master = intent.getStringExtra("master");
             if (StringUtils.isEmpty(master)) master = CommonUtil.getMaster();
             if (id != -1) {
-                initLoad(id, imid);
+                initLoad(id);
             } else {
-                initLoad(0, imid);
+                initLoad(0);
             }
         } else {
             initLoad(0);
@@ -154,19 +154,14 @@ public class ApprovaPresenter implements OnHttpResultListener {
         initLoad(record.nodeId);
     }
 
-    private void initLoad(int nodeId) {
-        initLoad(nodeId, "");
-    }
 
-    private void initLoad(int nodeId, String imid) {
+    private void initLoad(int nodeId) {
         record = new ApprovalRecord();
         approvals = new ArrayList<>();
         hineApprovals = new ArrayList<>();
         showApprovals = new ArrayList<>();
         historyNodes = null;
         record.nodeId = nodeId;
-        if (imid != null)
-            record.imid = imid;
         iApproval.initStatus();
         submit = false;
         loading = false;
@@ -713,7 +708,7 @@ public class ApprovaPresenter implements OnHttpResultListener {
             handerTitle(0);
             loadDetailedList();//获取明细表
         } else {
-            LogUtil.i("loading="+loading);
+            LogUtil.i("loading=" + loading);
             loading = false;
         }
     }
@@ -835,7 +830,9 @@ public class ApprovaPresenter implements OnHttpResultListener {
             if (!OACheckUtil.isEmpty(caption) && !approval.isDftypeEQ("H")) {
                 if (showAble) {
                     approval.setValues(OACheckUtil.getJson2Text(data, valueKey)); //获取第一个字段的值
-                    showApprovals.add(approval);
+                    if (addHint) {
+                        showApprovals.add(approval);
+                    }
                 } else if (addHint) {
                     hineApprovals.add(approval);
                 }