Merge remote-tracking branch 'origin/main'

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/utils/EchoNodeFormData.java

@@ -1,5 +1,6 @@
 package com.zkqy.execution.produce.utils;
 
+import com.zkqy.common.utils.StringUtils;
 import com.zkqy.execution.produce.dispersed.entity.BpmExecuteNode;
 import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFormDateVo;
 import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFormFilterConditionsVo;
@@ -74,10 +75,15 @@ public class EchoNodeFormData {
                     commonEntity.get().getResultMap().put(item.getListKey(), maps);
                 }
             } else {
-                //单条数据的回显逻辑
                 CommonEntity common = commonMapper.selectOne(item.getTableName(), item.getCondition());
                 if (common != null) {
-                    commonEntity.get().getResultMap().putAll(common.getResultMap());
+                    if(item.isNodeOnlyData()){
+                        //节点数据回显逻辑
+                        commonEntity.get().getResultMap().putAll(common.getResultMap());
+                    }else {
+                        //不是节点数据的表名做Key\对象做键
+                        commonEntity.get().getResultMap().put(item.getTableName(), common.getResultMap());
+                    }
                 }
             }
         });