Browse Source

提交类型 修复bug
提交内容 修复审批在从表没有必填项的时候不能同意的问题

Bitliker 7 years ago
parent
commit
96af45ff99

+ 8 - 2
app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/ApprovaPresenter.java

@@ -1558,17 +1558,23 @@ public class ApprovaPresenter implements OnHttpResultListener {
 
 
             for (List<Approval> details : detailList) {
             for (List<Approval> details : detailList) {
                 Map<String, Object> param = putItem2Params(true, details);
                 Map<String, Object> param = putItem2Params(true, details);
-                if (param == null || param.isEmpty() || param.keySet().size() <= 1) {
+                if (param == null) {
 //                    iApproval.showToast("明细行有必填字段未填写");
 //                    iApproval.showToast("明细行有必填字段未填写");
                     //将明细表必填项添加出来
                     //将明细表必填项添加出来
                     return false;
                     return false;
+                } else if (!param.isEmpty()) {
+                    params.add(param);
                 }
                 }
-                params.add(param);
             }
             }
         }
         }
         return true;
         return true;
     }
     }
 
 
+    /**
+     * @param showTocat
+     * @param approvals
+     * @return null:表示不通过
+     */
     private Map<String, Object> putItem2Params(boolean showTocat, List<Approval> approvals) {
     private Map<String, Object> putItem2Params(boolean showTocat, List<Approval> approvals) {
         Map<String, Object> formstore = new HashMap<>();
         Map<String, Object> formstore = new HashMap<>();
         for (Approval approval : approvals) {
         for (Approval approval : approvals) {