费用申请-批量审批时添加同意意见

src/main/java/com/liang/controller/PrjApproverecordController.java

@@ -366,8 +366,9 @@ public class PrjApproverecordController extends BaseController {
             record1.setYj(approverecord.getYj());
         } else {
             record1.setSffh(false);//是否返回
-            if (!approverecord.getSpcz().equals("提交审批"))
+            if (!approverecord.getSpcz().equals("提交审批")) {
                 record1.setYj(approverecord.getYj());
+            }
             //是否需要上级审核
             if (approverecord.getZt().equals(PostInfoEnum.YZ.postName() + "审批") || approverecord.getZt().equals(PostInfoEnum.ZGYLD.postName() + "审批") && dmoney < 1000000) {
                 record1.setSfsjsh(false);

src/main/java/com/liang/controller/StaBudgetapprovalController.java

@@ -299,16 +299,11 @@ public class StaBudgetapprovalController extends BaseController {
                 approveInfo.setSjshgwmc(postInfo.getPostName());
                 approveInfo.setSjshr(list.get(0).getUserId());
                 approveInfo.setSjshrxm(list.get(0).getName());
+                approveInfo.setYj("同意");
             }
             res.put("approveInfo", approveInfo);
         } else {
-            StaBudgetapproval approve = staBudgetapprovalService.queryById(xmid);
-            PrjApproverecord approveInfo = new PrjApproverecord();
-            approveInfo.setXmid(xmid);
-            approveInfo.setXm(approve.getSqmc());
-            approveInfo.setSqje(sqje);
-            approveInfo.setZt("数据不匹配");
-            res.put("approveInfo", approveInfo);
+           throw new CustomException("费用申请批量审批ERROR:数据不匹配,xmid:",xmid);
         }
         return res;