Merge remote-tracking branch 'origin/saas-api' into saas-api

fs-service/src/main/java/com/fs/company/service/workflow/impl/DynamicNodeAdjusterImpl.java

@@ -23,10 +23,20 @@ public class DynamicNodeAdjusterImpl implements DynamicNodeAdjuster {
         if (auxMapper == null) return new ArrayList<>();
         return auxMapper.selectDynamicImpls(companyId, null);
     }
-
+    // 合并后补全的 stub 实现：提供安全的默认行为，避免启动时缺少 bean。
+    // 完整动态调节逻辑可在后续补充（依赖更多 Lobster 表和 AI 服务）。
     @Override
-    public AdjustmentResult adjustNode(Long instanceId, Long companyId, String externalUserId, String customerMessage, String currentNodeCode, Map<String, Object> variables) {
-        return null;
+    public DynamicNodeAdjuster.AdjustmentResult adjustNode(Long instanceId, Long companyId, String externalUserId,
+                                       String customerMessage, String currentNodeCode,
+                                       Map<String, Object> variables) {
+        DynamicNodeAdjuster.AdjustmentResult r = new DynamicNodeAdjuster.AdjustmentResult();
+        r.setNextNodeCode(null);           // 不改变节点
+        r.setAdjustmentReason("stub-after-merge (no dynamic adjust)");
+        r.setTransferToHuman(false);
+        r.setDetectedIntent(null);
+        r.setDetectedSentiment(null);
+        r.setUpdatedVariables(variables);
+        return r;
     }
 
     @Override
@@ -36,6 +46,6 @@ public class DynamicNodeAdjusterImpl implements DynamicNodeAdjuster {
 
     @Override
     public String detectIntent(String customerMessage) {
-        return "";
+        return null;
     }
 }

fs-service/src/main/resources/db/tenant-initTable.sql

@@ -18272,6 +18272,33 @@ CREATE TABLE `company_workflow_lobster_variable`
     KEY             `idx_workflow_var` (`workflow_id`,`var_code`),
     KEY             `idx_cwlv_workflow_del` (`workflow_id`,`del_flag`)
 ) ENGINE=InnoDB AUTO_INCREMENT = 1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='工作流龙虾变量';
+
+-- ----------------------------
+-- Table structure for company_tag_template_binding
+-- ----------------------------
+DROP TABLE IF EXISTS `company_tag_template_binding`;
+CREATE TABLE `company_tag_template_binding`
+(
+    `id`              bigint       NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `company_id`      bigint       NOT NULL COMMENT '企业ID',
+    `tag_code`        varchar(128) NOT NULL COMMENT '标签编码',
+    `tag_name`        varchar(128) NOT NULL COMMENT '标签名称',
+    `template_id`     bigint       NOT NULL COMMENT '绑定的工作流模板ID',
+    `template_name`   varchar(256) DEFAULT NULL COMMENT '模板名称（冗余）',
+    `priority`        int          DEFAULT '0' COMMENT '优先级（数值越大优先级越高）',
+    `match_condition` text COMMENT '匹配条件（JSON格式）',
+    `status`          tinyint      DEFAULT '1' COMMENT '状态：0-禁用, 1-启用',
+    `del_flag`        tinyint      DEFAULT '0' COMMENT '删除标志 0正常 1删除',
+    `create_by`       varchar(64)  DEFAULT '' COMMENT '创建者',
+    `create_time`     datetime     DEFAULT NULL COMMENT '创建时间',
+    `update_by`       varchar(64)  DEFAULT '' COMMENT '更新者',
+    `update_time`     datetime     DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `idx_cttb_company_tag_template` (`company_id`,`tag_code`,`template_id`,`del_flag`),
+    KEY               `idx_cttb_company_del` (`company_id`,`del_flag`),
+    KEY               `idx_cttb_template` (`company_id`,`template_id`,`del_flag`),
+    KEY               `idx_cttb_status` (`company_id`,`status`,`del_flag`)
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='标签-模板绑定表';
 -- ----------------------------
 -- Table structure for company_ai_sensitive_word
 -- ----------------------------