diff --git a/src/main/java/com/rebuild/web/robot/approval/ApprovalController.java b/src/main/java/com/rebuild/web/robot/approval/ApprovalController.java index 082b18dca..cb0f5621d 100644 --- a/src/main/java/com/rebuild/web/robot/approval/ApprovalController.java +++ b/src/main/java/com/rebuild/web/robot/approval/ApprovalController.java @@ -8,6 +8,7 @@ package com.rebuild.web.robot.approval; import cn.devezhao.commons.web.ServletUtils; +import cn.devezhao.persist4j.Entity; import cn.devezhao.persist4j.Record; import cn.devezhao.persist4j.engine.ID; import com.alibaba.fastjson.JSON; @@ -79,7 +80,8 @@ public JSON getWorkable(HttpServletRequest request, @IdParam(name = "record") ID @GetMapping("state") public RespBody getApprovalState(HttpServletRequest request, @IdParam(name = "record") ID recordId) { - if (!MetadataHelper.hasApprovalField(MetadataHelper.getEntity(recordId.getEntityCode()))) { + final Entity approvalEntity = MetadataHelper.getEntity(recordId.getEntityCode()); + if (!MetadataHelper.hasApprovalField(approvalEntity)) { return RespBody.error("NOT AN APPROVAL ENTITY"); } @@ -87,6 +89,7 @@ public RespBody getApprovalState(HttpServletRequest request, @IdParam(name = "re final ApprovalStatus status = ApprovalHelper.getApprovalStatus(recordId); JSONObject data = new JSONObject(); + data.put("entityName", approvalEntity.getName()); int stateVal = status.getCurrentState().getState(); data.put("state", stateVal); diff --git a/src/main/resources/web/assets/js/admin/approval-list.js b/src/main/resources/web/assets/js/admin/approval-list.js index 2ef1a94f4..e4d08730a 100644 --- a/src/main/resources/web/assets/js/admin/approval-list.js +++ b/src/main/resources/web/assets/js/admin/approval-list.js @@ -272,7 +272,7 @@ class ApprovalReferral extends RbModalHandler { $mp.end() if (res.error_code === 0) { - RbHighbar.success(res.data > 0 ? $L('已转审 %d 条审批记录') : $L('批量转审完成')) + RbHighbar.success(res.data > 0 ? $L('已转审 %d 条审批记录', res.data) : $L('批量转审完成')) setTimeout(() => that.hide(), 1500) } else { RbHighbar.error(res.error_msg)