--待阅处理

zrch-risk-client-39/src/views/flowable/task/todo/todoReadindex.vue

@@ -40,7 +40,7 @@
         class="custom-class"
         root-class-name="root-class-name"
         :root-style="{ color: 'blue' }"
-        title="待办任务"
+        title="待阅任务"
         placement="right"
         width="90%"
         style="margin: 0px; padding: 0px"

zrch-risk-client-39/src/views/mytaskflowcc/MyTaskFlowCcList.vue

@@ -44,7 +44,7 @@
             <span class="tag">任务节点: {{ taskName }}</span>
           </div>
         </template>
-        <TodoIndex v-if="isShowDrawer" ref="refTodoIndex" @callback="handleSuccess" />
+        <TodoReadIndex v-if="isShowDrawer" ref="refTodoIndex" @callback="handleSuccess" />
       </a-drawer>
     </div>
 
@@ -75,7 +75,7 @@
   import { getDateByPicker } from '/@/utils';
   import { todoList, getMyTaskFlow } from '/@/components/Process/api/todo';
   // 引入待办任务组件
-  import TodoIndex from '../flowable/task/todo/components/TodoIndex.vue';
+  import TodoReadIndex from '../flowable/task/todo/components/TodoReadIndex.vue';
    // 引入详情组件
   import Detail from '../flowable/task/myProcess/components/Detail.vue';
   const taskCache = new Map<string, any>();

zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowInstanceServiceImpl.java

@@ -157,12 +157,14 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
         HistoricProcessInstance historicProcessInstance = getHistoricProcessInstanceById(instanceId);
         if (historicProcessInstance.getEndTime() != null) {
             historyService.deleteHistoricProcessInstance(historicProcessInstance.getId());
-            return;
+           // return;
+        }else{
+            // 删除流程实例
+            runtimeService.deleteProcessInstance(instanceId, deleteReason);
+            // 删除历史流程实例
+            historyService.deleteHistoricProcessInstance(instanceId);
         }
-        // 删除流程实例
-        runtimeService.deleteProcessInstance(instanceId, deleteReason);
-        // 删除历史流程实例
-        historyService.deleteHistoricProcessInstance(instanceId);
+
         //删除业务数据
         sysDeployFormService.deleteMyTaskFlowAndCCAndHis(instanceId);
 

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/my/controller/MyTaskFlowCcController.java

@@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.stm.utils.UserUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -69,6 +70,7 @@ public class MyTaskFlowCcController extends JeecgController<MyTaskFlowCc, IMyTas
 
         QueryWrapper<MyTaskFlowCc> queryWrapper = QueryGenerator.initQueryWrapper(myTaskFlowCc, req.getParameterMap());
 		Page<MyTaskFlowCc> page = new Page<MyTaskFlowCc>(pageNo, pageSize);
+		queryWrapper.eq("ccid", UserUtil.getUserId());
 		IPage<MyTaskFlowCc> pageList = myTaskFlowCcService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}