回显模型key

flow-app/src/main/resources/mapper/workflow/FlowDefineDao.xml

@@ -11,6 +11,7 @@
         <result property="process" column="process" jdbcType="VARCHAR" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result property="form" column="form" jdbcType="VARCHAR" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result property="defineId" column="define_id" jdbcType="VARCHAR"/>
+        <result property="modelId" column="model_id" jdbcType="INTEGER"/>
         <result property="version" column="version" jdbcType="INTEGER"/>
         <result property="groupId" column="group_id" jdbcType="INTEGER"/>
         <result property="admin" column="admin" jdbcType="VARCHAR" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
@@ -35,6 +36,7 @@
                rp.DESCRIPTION_      AS description,
                fd.id,
                fd.group_id,
+               fd.model_id,
                fd.icon,
                fd.process,
                fd.form,
@@ -59,6 +61,7 @@
             rp.DESCRIPTION_      AS description,
             fd.id,
             fd.group_id,
+            fd.model_id,
             fd.icon,
             fd.admin,
             fd.starters,

flow-workflow/flow-workflow-biz/src/main/java/com/flow/service/impl/FlowDefineServiceImpl.java

@@ -106,7 +106,7 @@ public class FlowDefineServiceImpl extends BaseServiceImpl<FlowDefineDao, FlowDe
         FormModel formModel = flowDefine.getForm();
         List<Field> fields = formModel.findByName("SerialNumber");
         for (Field field : fields) {
-            String value = this.generateSerialNumber(field, flowDefine.getModelId());
+            String value = this.generateSerialNumber(field, flowDefine.getKey());
             if (StringUtils.isNotBlank(value)) {
                 values.put(field.getId(), value);
             }
@@ -148,12 +148,12 @@ public class FlowDefineServiceImpl extends BaseServiceImpl<FlowDefineDao, FlowDe
         }
     }
 
-    private String generateSerialNumber(Field field, Long modelId) {
+    private String generateSerialNumber(Field field, String modelKey) {
         Map<String, Object> props = field.getProps();
         Object rules = props.get("rules");
         List<SerialRule> serialRules = objectMapper.convertValue(rules, new TypeReference<List<SerialRule>>() {
         });
-        String key = String.format("%s:%s", modelId, field.getId());
+        String key = String.format("%s:%s", modelKey, field.getId());
         return serialRules.stream().map(e->e.generate(key)).collect(Collectors.joining());
     }