diff --git a/resources/assets/js/home/CaseDetail.vue b/resources/assets/js/home/CaseDetail.vue index 7b14b0cfb..a5e3cfb60 100644 --- a/resources/assets/js/home/CaseDetail.vue +++ b/resources/assets/js/home/CaseDetail.vue @@ -518,7 +518,8 @@ export default { APP_UID: v.APP_UID, DEL_INDEX: v.DEL_INDEX, PRO_UID: v.PRO_UID, - TAS_UID: v.TAS_UID + TAS_UID: v.TAS_UID, + UNASSIGNED: v.UNASSIGNED }); }); return data; @@ -580,7 +581,8 @@ export default { DEL_INDEX: data.row.DEL_INDEX, PRO_UID: data.row.PRO_UID, TAS_UID: data.row.TAS_UID, - ACTION: this.dataCase.ACTION || "todo" + ACTION: this.dataCase.ACTION || "todo", + UNASSIGNED: data.row.UNASSIGNED }); this.$emit("onUpdatePage", "XCase"); } diff --git a/resources/assets/js/home/XCase.vue b/resources/assets/js/home/XCase.vue index e2d9ef9fc..e1cb815c0 100644 --- a/resources/assets/js/home/XCase.vue +++ b/resources/assets/js/home/XCase.vue @@ -49,6 +49,12 @@ export default { window.config.SYS_URI + `cases/open?APP_UID=${this.dataCase.APP_UID}&DEL_INDEX=${this.dataCase.DEL_INDEX}&TAS_UID=${this.dataCase.TAS_UID}&action=${this.dataCase.ACTION}`; } + if (this.dataCase.UNASSIGNED === true) { + this.path = + window.config.SYS_SERVER_AJAX + + window.config.SYS_URI + + `cases/open?APP_UID=${this.dataCase.APP_UID}&DEL_INDEX=${this.dataCase.DEL_INDEX}&action=unassigned`; + } setTimeout(() => { let that = this; diff --git a/workflow/engine/classes/model/ListMyInbox.php b/workflow/engine/classes/model/ListMyInbox.php index 7fea0fd3c..05e8819bd 100644 --- a/workflow/engine/classes/model/ListMyInbox.php +++ b/workflow/engine/classes/model/ListMyInbox.php @@ -148,9 +148,9 @@ class ListMyInbox extends BaseListMyInbox implements ListInterface $dataset->next(); $aRow = $dataset->getRow(); $data['DEL_CURRENT_USR_UID'] = $data['USR_UID']; - $data['DEL_CURRENT_USR_USERNAME'] = $aRow['USR_USERNAME']; - $data['DEL_CURRENT_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME']; - $data['DEL_CURRENT_USR_LASTNAME'] = $aRow['USR_LASTNAME']; + $data['DEL_CURRENT_USR_USERNAME'] = is_array($aRow) ? $aRow['USR_USERNAME'] : ''; + $data['DEL_CURRENT_USR_FIRSTNAME'] = is_array($aRow) ? $aRow['USR_FIRSTNAME'] : ''; + $data['DEL_CURRENT_USR_LASTNAME'] = is_array($aRow) ? $aRow['USR_LASTNAME'] : ''; if ($data['DEL_INDEX'] == 1 && $data['APP_STATUS'] == 'TO_DO') { $data['APP_CREATE_DATE'] = $data['APP_UPDATE_DATE'];