diff --git a/app/Http/Controllers/Api/ApproveController.php b/app/Http/Controllers/Api/ApproveController.php index 7ee46a915..b4f6319ce 100755 --- a/app/Http/Controllers/Api/ApproveController.php +++ b/app/Http/Controllers/Api/ApproveController.php @@ -1128,5 +1128,27 @@ class ApproveController extends AbstractController return Base::retSuccess('success', ''); } + /** + * @api {get} api/approve/process/doto 20. 查询需要我审批的流程数量 + * + * @apiDescription 需要token身份 + * @apiVersion 1.0.0 + * @apiGroup approve + * @apiName process__doto + * + * @apiSuccess {Number} ret 返回状态码(1正确、0错误) + * @apiSuccess {String} msg 返回信息(错误描述) + * @apiSuccess {Object} data 返回数据 + */ + public function process__doto() + { + $user = User::auth(); + $ret = Ihttp::ihttp_get($this->flow_url.'/api/v1/workflow/process/findTaskTotal?userid='.$user->userid); + $process = json_decode($ret['ret'] == 1 ? $ret['data'] : '{}', true); + if (!$process || $process['status'] != 200) { + return Base::retError($process['message'] ?? '查询失败'); + } + return Base::retSuccess('success', $process['data']); + } } diff --git a/docker-compose.yml b/docker-compose.yml index 15573cd99..ea2205aa6 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -150,7 +150,7 @@ services: approve: container_name: "dootask-approve-${APP_ID}" - image: "kuaifan/dooapprove:0.0.9" + image: "kuaifan/dooapprove:0.0.10" environment: TZ: "${TIMEZONE:-PRC}" MYSQL_HOST: "${DB_HOST}" diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index 29b3b1627..8205e3045 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -588,14 +588,19 @@ export default { state.approveUnreadNumber = 0; } else { dispatch("call", { - url: 'approve/process/findTask', - data: { - page:1, - page_size: 500, - } + url: 'approve/process/doto' }).then(({data}) => { state.approveUnreadNumber = data.total || 0; - }).catch(_ => {}); + }).catch(({msg}) => { + if( msg.indexOf("404 not found") !== -1){ + $A.modalInfo({ + language: false, + title: '版本过低', + content: '服务器版本过低,请升级服务器。', + }) + return; + } + }); } }, typeof timeout === "number" ? timeout : 1000) },