Browse Source

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

Bitliker 8 years ago
parent
commit
ff37543fce

+ 15 - 11
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/ApprovaPresenter.java

@@ -729,17 +729,21 @@ public class ApprovaPresenter implements OnHttpResultListener {
             JSONArray griddatas = OACheckUtil.getJsonArray(object, "griddata");
             JSONArray gridconfigs = OACheckUtil.getJsonArray(object, "gridconfigs");
             final List<Approval> detailedList = new ArrayList<>();
-            if (!ListUtils.isEmpty(griddatas) && !ListUtils.isEmpty(gridconfigs)) {
-                for (int i = 0; i < griddatas.size(); i++) {
-                    //获取到单个明细表单
-                    final List<Approval> detailedApproval = formandGriddata(griddatas.getJSONObject(i),
-                            gridconfigs, record.caller,
-                            false, i == 0);
-                    if (!ListUtils.isEmpty(detailedApproval)) {
-                        Approval approval = new Approval(Approval.TAG);
-                        approval.setCaption(getString(R.string.serial_number) + (i + 1));
-                        detailedApproval.add(0, approval);
-                        detailedList.addAll(detailedApproval);
+            if (!ListUtils.isEmpty(gridconfigs)) {
+                if (ListUtils.isEmpty(griddatas)) {
+                    formandGriddata(null, gridconfigs, record.caller, false, true);
+                } else {
+                    for (int i = 0; i < griddatas.size(); i++) {
+                        //获取到单个明细表单
+                        final List<Approval> detailedApproval = formandGriddata(griddatas.getJSONObject(i),
+                                gridconfigs, record.caller,
+                                false, i == 0);
+                        if (!ListUtils.isEmpty(detailedApproval)) {
+                            Approval approval = new Approval(Approval.TAG);
+                            approval.setCaption(getString(R.string.serial_number) + (i + 1));
+                            detailedApproval.add(0, approval);
+                            detailedList.addAll(detailedApproval);
+                        }
                     }
                 }
             }