fix:控制返回多条or单条表单防止空指针

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;
@@ -64,13 +65,6 @@ public class EchoNodeFormData {
             if (item.isNodeOnlyData()) {//默认是带这个流程条件信息的
                 item.getCondition().put("task_key", bpmRunNodeFromVo.getTaskProcessKey());
                 item.getCondition().put("task_node_key", bpmRunNodeFromVo.getTaskNodeKey());
-            }else {
-                if(item.getListKey().isEmpty()){
-                    CommonEntity common = commonMapper.selectOne(item.getTableName(), item.getCondition());
-                    if (common != null) {
-                        commonEntity.get().getResultMap().put(item.getTableName(), common);
-                    }
-                }
             }
             //是否是节点回填数据（默认是true）
             String listKey = item.getListKey();
@@ -81,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);
+                    }
                 }
             }
         });