或签撤回

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarApprovalController.java

@@ -180,8 +180,8 @@ public class CmcCarApprovalController extends BaseController
                 CmcProject cmcProject = new CmcProject();
                 cmcProject.setProjectId(formDataJson.getString("projectId"));
                 CmcProject project = cmcProjectService.selectCmcProjectByProjectId(cmcProject.getProjectId());
-                project.setDrivers(cmcCarApproval.getDrivers());
-                project.setCars(carString);
+                project.setDrivers(project.getDrivers() + "," + cmcCarApproval.getDrivers());
+                project.setCars(project.getCars() + "," + carString);
                 cmcProjectService.updateCmcProject(project);
             }
             String[] cars = carString.split(",");

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceApprovalController.java

@@ -147,7 +147,7 @@ public class CmcDeviceApprovalController extends BaseController
                 CmcProject cmcProject = new CmcProject();
                 cmcProject.setProjectId(formDataJson.getString("projectId"));
                 CmcProject project = cmcProjectService.selectCmcProjectByProjectId(cmcProject.getProjectId());
-                project.setDevices(cmcDeviceApproval.getModifyDevices());
+                project.setDevices(project.getDevices() + "," + cmcDeviceApproval.getModifyDevices());
                 cmcProjectService.updateCmcProject(project);
             }
             String[] devices = deviceString.split(",");

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -666,8 +666,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 .list();
         String myTaskId = null;
         String nextUserTaskId = null;
-        Map<String, Object> currentVariables = taskService.getVariables(taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).singleResult().getId());
-        List<UserTask> nextUserTask = FindNextNodeUtil.getNextUserTasksByHistTask(repositoryService, task, currentVariables);
 
         for (HistoricTaskInstance hti : htiList) {
             if (loginUser.getUserId().toString().equals(hti.getAssignee())) {
@@ -675,21 +673,27 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 break;
             }
         }
-        for (HistoricTaskInstance hti : htiList) {
-            if (CollectionUtils.isNotEmpty(nextUserTask)) {
-                for (UserTask userTask : nextUserTask) {
-                    if (userTask.getId().equals(hti.getTaskDefinitionKey()) && hti.getEndTime() != null && hti.getDeleteReason() == null) {
-                        nextUserTaskId = task.getTaskDefinitionKey();
-                        break;
-                    }
-                }
-            }
-        }
         if (null == myTaskId) {
             throw new CustomException("该任务非当前用户提交，无法撤回");
         }
-        if (nextUserTaskId != null) {
-            throw new CustomException("下一节点已办理，无法撤回");
+        List<Task> taskList = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).list();
+        if (taskList.size() == 1) {
+            Map<String, Object> currentVariables = taskService.getVariables(taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).singleResult().getId());
+            List<UserTask> nextUserTask = FindNextNodeUtil.getNextUserTasksByHistTask(repositoryService, task, currentVariables);
+
+            for (HistoricTaskInstance hti : htiList) {
+                if (CollectionUtils.isNotEmpty(nextUserTask)) {
+                    for (UserTask userTask : nextUserTask) {
+                        if (userTask.getId().equals(hti.getTaskDefinitionKey()) && hti.getEndTime() != null && hti.getDeleteReason() == null) {
+                            nextUserTaskId = task.getTaskDefinitionKey();
+                            break;
+                        }
+                    }
+                }
+            }
+            if (nextUserTaskId != null) {
+                throw new CustomException("下一节点已办理，无法撤回");
+            }
         }
         // 获取流程定义信息
         ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(task.getProcessDefinitionId()).singleResult();

oa-ui/src/views/oa/material/buy.vue

@@ -36,19 +36,19 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['oa:materialBuy:add']">新增</el-button>
+          v-hasPermi="['oa:buy:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['oa:materialBuy:edit']">修改</el-button>
+          v-hasPermi="['oa:buy:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['oa:materialBuy:remove']">删除</el-button>
+          v-hasPermi="['oa:buy:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['oa:materialBuy:export']">导出</el-button>
+          v-hasPermi="['oa:buy:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -74,9 +74,9 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:materialBuy:edit']">修改</el-button>
+            v-hasPermi="['oa:buy:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:materialBuy:remove']">删除</el-button>
+            v-hasPermi="['oa:buy:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>

oa-ui/src/views/oa/material/give.vue

@@ -39,19 +39,19 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['oa:materialGive:add']">新增</el-button>
+          v-hasPermi="['oa:give:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['oa:materialGive:edit']">修改</el-button>
+          v-hasPermi="['oa:give:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['oa:materialGive:remove']">删除</el-button>
+          v-hasPermi="['oa:give:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['oa:materialGive:export']">导出</el-button>
+          v-hasPermi="['oa:give:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -75,9 +75,9 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:materialGive:edit']">修改</el-button>
+            v-hasPermi="['oa:give:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:materialGive:remove']">删除</el-button>
+            v-hasPermi="['oa:give:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>