Merge remote-tracking branch 'origin/main'

ruoyi-ui/src/views/hrm/components/BizDetailContainer/index.vue

@@ -295,6 +295,10 @@ export default {
       }
     },
     async loadComment () {
+      if (!this.flowInstance || !this.flowInstance.instId) {
+        this.commentList = []
+        return
+      }
       try {
         const res = await listFlowComment({ instId: this.flowInstance.instId })
         this.commentList = res.rows
@@ -352,6 +356,10 @@ export default {
       }
     },
     async loadAssignTask () {
+      if (!this.detail.instId) {
+        this.assignTasks = []
+        return
+      }
       try {
         const res = await listAssignTask(this.detail.instId)
         this.assignTasks = res?.data || []

ruoyi-ui/src/views/hrm/requests/sealDetail.vue

@@ -427,6 +427,10 @@ export default {
         })
     },
     async loadAssignTask () {
+      if (!this.seal || !this.seal.instId) {
+        this.assignTasks = []
+        return
+      }
       try {
         // const res = await getTodoTaskByBiz('seal', this.currentBizId)
         console.log(this.seal)