diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/process/TicketProcessEventListener.java b/modules/ticket/src/main/java/com/bytedesk/ticket/process/TicketProcessEventListener.java index b9f45d0eb7..aeeb8f7923 100644 --- a/modules/ticket/src/main/java/com/bytedesk/ticket/process/TicketProcessEventListener.java +++ b/modules/ticket/src/main/java/com/bytedesk/ticket/process/TicketProcessEventListener.java @@ -74,7 +74,7 @@ public class TicketProcessEventListener { .key(TicketConsts.TICKET_PROCESS_KEY_GROUP) .description(TicketConsts.TICKET_PROCESS_NAME_GROUP) .build(); - processRequest.setUid(processUid.toLowerCase()); + processRequest.setUid(processUid); processRequest.setContent(groupTicketBpmn20Xml); processRequest.setOrgUid(orgUid); ticketProcessRestService.create(processRequest); diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/process/TicketProcessInitializer.java b/modules/ticket/src/main/java/com/bytedesk/ticket/process/TicketProcessInitializer.java index e895035786..15d3206278 100644 --- a/modules/ticket/src/main/java/com/bytedesk/ticket/process/TicketProcessInitializer.java +++ b/modules/ticket/src/main/java/com/bytedesk/ticket/process/TicketProcessInitializer.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2025-02-15 13:03:35 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-02-15 13:51:20 + * @LastEditTime: 2025-02-15 14:05:34 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -79,7 +79,7 @@ public class TicketProcessInitializer implements SmartInitializingSingleton { try { // 读取文件内容 String groupTicketBpmn20Xml = FileUtils.readFileToString(resource.getFile(), "UTF-8"); - log.info("groupTicketBpmn20Xml: {}", groupTicketBpmn20Xml); + // log.info("groupTicketBpmn20Xml: {}", groupTicketBpmn20Xml); // 判断所有组织是否存在 TicketProcessEntity List organizations = organizationService.findAll(); for (OrganizationEntity organization : organizations) { @@ -92,17 +92,18 @@ public class TicketProcessInitializer implements SmartInitializingSingleton { if (!existingDeployments.isEmpty()) { log.info("工单流程已存在,跳过部署: tenantId={}", orgUid); + continue; } - String processUid = orgUid + "_" + TicketConsts.TICKET_PROCESS_KEY_GROUP; + String processUid = (orgUid + "_" + TicketConsts.TICKET_PROCESS_KEY_GROUP).toLowerCase(); // 初始化 TicketProcessEntity TicketProcessRequest processRequest = TicketProcessRequest.builder() .name(TicketConsts.TICKET_PROCESS_NAME_GROUP) .key(TicketConsts.TICKET_PROCESS_KEY_GROUP) .description(TicketConsts.TICKET_PROCESS_NAME_GROUP) .build(); - processRequest.setUid(processUid.toLowerCase()); + processRequest.setUid(processUid); processRequest.setOrgUid(orgUid); processRequest.setContent(groupTicketBpmn20Xml); ticketProcessRestService.create(processRequest); diff --git a/modules/ticket/src/main/java/com/bytedesk/ticket/process/TicketProcessRestService.java b/modules/ticket/src/main/java/com/bytedesk/ticket/process/TicketProcessRestService.java index 983009188a..4d07096762 100644 --- a/modules/ticket/src/main/java/com/bytedesk/ticket/process/TicketProcessRestService.java +++ b/modules/ticket/src/main/java/com/bytedesk/ticket/process/TicketProcessRestService.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-05-11 18:25:45 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-02-15 14:00:26 + * @LastEditTime: 2025-02-15 14:03:30 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -87,6 +87,9 @@ public class TicketProcessRestService extends BaseRestService optionalKey = processRepository.findByKeyAndOrgUid(request.getKey(), request.getOrgUid()); @@ -98,12 +101,11 @@ public class TicketProcessRestService extends BaseRestService