内控

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -1674,6 +1674,16 @@ public class InformationWriteQueryController extends BladeController {
                                 jdbcTemplate.execute(StringUtils.join(strings, ""));
                             }
                         } catch (Exception e) {
+                            //手动回滚，删除节点、表
+                            List<String> collect1 = nodes.stream().map(WbsTreeContract::getPKeyId).map(String::valueOf).collect(Collectors.toList());
+                            List<String> collect2 = tabs.stream().map(WbsTreeContract::getPKeyId).map(String::valueOf).collect(Collectors.toList());
+                            collect1.addAll(collect2);
+                            if (collect1.size() > 0) {
+                                jdbcTemplate.execute("delete from m_wbs_tree_contract where p_key_id in(" + StringUtils.join(collect1, ",") + ")");
+                            }
+                            //标记当前事务为回滚状态
+                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+
                             e.printStackTrace();
                             throw new ServiceException("保存数据异常，请联系管理员");
                         }

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/TaskProcessServiceImpl.java

@@ -883,7 +883,7 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
                         }
 
                         //日志操作信息
-                        planInformService.taskFinishedInform("计划任务完成", planTaskInfo.getTaskUser(), SecureUtil.getNickName(), taskProcessInfo.getStatus());
+                        planInformService.taskFinishedInform2("计划任务完成", taskProcessInfo.getAuditUserIds(), SecureUtil.getNickName(), taskProcessInfo.getStatus());
 
                     } else if (dto.getUpdateType().equals("2")) {
                         //任务转移
@@ -923,7 +923,7 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
                         jdbcTemplate.execute("delete from c_expense_task_record where expense_info_type = 1 and expense_info_id = " + planTaskInfo.getId() + " ; insert into c_expense_task_record(id,task_id,expense_info_id,expense_info_type) values (" + SnowFlakeUtil.getId() + "," + taskProcessInfo.getId() + "," + planTaskInfo.getId() + ",1)");
 
                         //日志操作信息
-                        planInformService.taskFinishedInform("计划任务转移", planTaskInfo.getTaskUser(), SecureUtil.getNickName(), taskProcessInfo.getStatus());
+                        planInformService.taskFinishedInform2("计划任务转移", taskProcessInfo.getAuditUserIds(), SecureUtil.getNickName(), taskProcessInfo.getStatus());
                     }
                 }
                 //解锁