fix:表单查询回显数据逻辑修改

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

@@ -53,18 +53,19 @@ public class EchoNodeFormData {
         //查询表名、条件封装的集合
         List<BpmRunNodeFormFilterConditionsVo> formDataVoList = bpmRunNodeFromVo.getFormDataVoList();
         formDataVoList.forEach(item -> {
+            //表单回填数据查询
+            if (item.isNodeOnlyData()) {//默认是带这个流程条件信息的
+                item.getCondition().put("taskProcessKey", bpmRunNodeFromVo.getTaskProcessKey());
+                item.getCondition().put("taskNodeKey", bpmRunNodeFromVo.getTaskNodeKey());
+            }
             //是否是节点回填数据（默认是true）
             String listKey = item.getListKey();
             if (listKey != null) {
-                //下拉框查询
-                List<Map<String, Object>> maps = commonMapper.selectDropDownListNotWhere(item.getTableName());
+                //下拉框数据、或者表格多条数据
+                List<Map<String, Object>> maps = commonMapper.selectListMap(item.getTableName(),item.getCondition());
                 commonEntity.get().getResultMap().put(item.getListKey(), maps);
             } else {
-                //表单回填数据查询
-                if (item.isNodeOnlyData()) {//默认是带这个流程条件信息的
-                    item.getCondition().put("taskProcessKey", bpmRunNodeFromVo.getTaskProcessKey());
-                    item.getCondition().put("taskNodeKey", bpmRunNodeFromVo.getTaskNodeKey());
-                }
+                //单条数据的回显逻辑
                 CommonEntity common = commonMapper.selectOne(item.getTableName(), item.getCondition());
                 commonEntity.get().getResultMap().putAll(common.getResultMap());
             }

zkqy-system/src/main/java/com/zkqy/system/mapper/CommonMapper.java

@@ -16,6 +16,14 @@ public interface CommonMapper {
      */
     List<CommonEntity> selectList(@Param("tableName") String tableName, @Param("conditions") Map<String, Object> conditions);
 
+    /**
+     * 查询列表
+     * @param tableName
+     * @param conditions
+     * @return
+     */
+    List<Map<String,Object>> selectListMap(@Param("tableName") String tableName, @Param("conditions") Map<String, Object> conditions);
+
     /**
      * 获取详情数据
      * @param tableName

zkqy-system/src/main/resources/mapper/common/CommonMapper.xml

@@ -21,6 +21,17 @@
         </where>
     </select>
 
+    <select id="selectListMap" resultType="java.util.Map">
+        select * from ${tableName}
+        <where>
+            <if test="conditions != null">
+                <foreach collection="conditions" item="value" index="key" separator="and">
+                    ${key}=#{value}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
     <select id="selectOne" resultMap="retMap">
         select * from {DBNAME}.${tableName}
         <where>