fix 审批人不是审批流中的人bug
This commit is contained in:
@@ -179,6 +179,7 @@ public class OperationLogServiceImpl implements OperationLogService {
|
||||
public Boolean batchUpdateProcessed(List<OperationLogDO> operationLogs, Long audit, String userId, String reason) {
|
||||
List<OperationLogDO> operationLogList = new ArrayList<>();
|
||||
Boolean flag = Boolean.FALSE;
|
||||
Date createTime = new Date();
|
||||
for (OperationLogDO operationLogDO : operationLogs) {
|
||||
operationLogDO.setUpdateTime(new Date());
|
||||
operationLogDO.setUpdateUserId(userId);
|
||||
@@ -187,6 +188,9 @@ public class OperationLogServiceImpl implements OperationLogService {
|
||||
operationLogDO.setAuditResultId(audit);
|
||||
flag = Boolean.TRUE;
|
||||
}
|
||||
if (operationLogDO.getType().equals(OperationTypeEnum.OPERATION_TYPE_1.getCode())) {
|
||||
createTime = operationLogDO.getCreateTime();
|
||||
}
|
||||
operationLogDO.setRemarks(reason);
|
||||
operationLogList.add(operationLogDO);
|
||||
}
|
||||
@@ -205,7 +209,7 @@ public class OperationLogServiceImpl implements OperationLogService {
|
||||
if (StringUtils.isNotBlank(userName)) {
|
||||
operationLogDO.setOperatorName(userName);
|
||||
}
|
||||
operationLogDO.setCreateTime(new Date());
|
||||
operationLogDO.setCreateTime(createTime);
|
||||
operationLogDO.setUpdateTime(new Date());
|
||||
operationLogDO.setCreateUserId(userId);
|
||||
operationLogDAO.addOperationLog(operationLogDO);
|
||||
|
||||
Reference in New Issue
Block a user