Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AuditLogApiServiceImpl.java

@@ -172,7 +172,7 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
             }
 
             //重制，为了循环新增
-            auditLogDTO.setAuditorId(null);
+            auditLogDTO.setAuditLogId(null);
 
             if (auditorDTO.getUserId() != null && !AuditTypeEnum.HAOBAN.getCode().equals(auditLogDTO.getAuditType())) {
                 ServiceResponse<UserDTO> userResponse = userApiService.getUserInfoById(auditorDTO.getUserId());
@@ -233,6 +233,7 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
             // 记录审批流程
             //重置日志主键ID
             auditLogDTO.setAuditLogId(e.getAuditLogId());
+            auditLog.setAuditLogId(e.getAuditLogId());
             TabAuditProcess auditProcess = getProcess(auditLog, auditLogDTO, projectItem);
             this.auditProcessService.save(auditProcess);
             // todo 如果是平台级审批项 要先判断是否实施和管理员都通过了  一期先不做