Merge remote-tracking branch 'origin/developer' into developer

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

@@ -50,7 +50,7 @@ public class AuditLogServiceImpl implements AuditLogService {
         auditLog.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
         auditLog.setCreateTime(new Date());
         tabAuditLogMapper.insertSelective(auditLog);
-        return auditLog.getAuditorId();
+        return auditLog.getAuditLogId();
     }
 
     @Override

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

@@ -161,7 +161,7 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
                         todoItemDTO.setItemContent(projectItem.getProjectItemDesc());
                         // 事项code
                         todoItemDTO.setItemType(com.gic.enterprise.constant.Constants.TODO_ITEM_AUDIT);
-                        // todo 事项url
+                        // 事项url
                         todoItemDTO.setItemInfoUrl(com.gic.enterprise.constant.Constants.TODO_ITEM_AUDIT_URL + "?auditLogId=" + auditLogId);
                         todoItemApiService.saveTodoItem(todoItemDTO);
                     }
@@ -183,6 +183,7 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
             autoAudit.setAuditResult(DataSecurityAuditEnum.PASS.getCode());
             autoAudit.setAuditorPhone(auditLogDTO.getApplyUserPhone());
             autoAudit.setAuditorName(auditLogDTO.getAuditorName());
+            autoAudit.setAuditLogId(auditLogId);
             autoAudit.setAuditReason("自动审批");
             this.audit(autoAudit);
 
@@ -331,10 +332,7 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
         TabEnterprise enterprise = enterpriseService.getEnterpriseById(auditLogDTO.getEnterpriseId());
         UserDTO userDTO = userApiService.getUserById(auditLogDTO.getApplyUserId()).getResult();
         LoginUserTypeEnum userTypeEnum = LoginUserTypeEnum.getByCode(userDTO.getLoginType());
-        String position = "";
-        if (userTypeEnum != null) {
-            position = userTypeEnum.getMessage();
-        }
+        String position = userTypeEnum != null ? userTypeEnum.getMessage() : "";
         String[] keyWord = {enterprise.getEnterpriseName(), auditorDTO.getAuditorName(), position, auditLogDTO.getProjectItemName()};
         // todo 跳转地址
         this.wxTemplateRouterApiService.sendForDownloadData(auditorDTO.getOpenid(), null, keyWord);