fix:整理修复调整变量

zkqy-system/src/main/java/com/zkqy/system/service/impl/DragTableGroupServiceImpl.java

@@ -210,7 +210,9 @@ public class DragTableGroupServiceImpl implements IDragTableGroupService {
                 if (dragTableVo.getSearchFieldList().size() > 0) {
                     List<DragTableCondition> dragTableConditionList = new ArrayList<>();
                     dragTableVo.getSearchFieldList().forEach(item -> {
-                        dragTableConditionList.add(new DragTableCondition(dragTable.gettId(), item,dragTableVo.getConditionDefaultValueMap().get(item).toString()));
+                        if(dragTableVo.getConditionDefaultValueMap().size()>0){
+                            dragTableConditionList.add(new DragTableCondition(dragTable.gettId(), item,dragTableVo.getConditionDefaultValueMap().get(item).toString()));
+                        }
                     });
                     dragTableConditionMapper.insertDragTableConditionByList(dragTableConditionList);
                 }
@@ -396,6 +398,7 @@ public class DragTableGroupServiceImpl implements IDragTableGroupService {
             TableSql tableSql = tableSqlMapper.selectTableSqlByTSqlKey(item.getSqlKey());
             if(tableSql!=null){
                 item.setOrderByColumn(tableSql.getOrderByColumn());
+                item.setSortOrder(tableSql.getSortOrder());
             }
             return item;
         }).collect(Collectors.toList());

zkqy-system/src/main/java/com/zkqy/system/service/impl/DragTableServiceImpl.java

@@ -291,7 +291,7 @@ public class DragTableServiceImpl implements IDragTableService {
             dragTable.setDtColumnName(JSON.toJSONString(dragTableVo.getDtColumnName()));
             dragTable.setPrimaryKey(dragTableVo.getPrimaryKey());
             dragTable.setMenuId(dragTableVo.getMenuId());
-            dragTable.setDtName(dragTableVo.getDtTableName());//表格名称
+            dragTable.setDtName(dragTableVo.getDtName());//表格名称
             dragTable.setDtType("1");
             //add table_sql
             TableSql tableSql = new TableSql();
@@ -335,6 +335,7 @@ public class DragTableServiceImpl implements IDragTableService {
                     dragTableConditionList.add(new DragTableCondition(dragTable.gettId(), item, dragTableVo.getConditionDefaultValueMap().get(item).toString()));
                 });
                 dragTableConditionMapper.insertDragTableConditionByList(dragTableConditionList);
+                System.out.println("111111");
             }
             //给表格增加按钮
             if (dragTableVo.getDragTableBtnRelevanceList() != null && dragTableVo.getDragTableBtnRelevanceList().size() > 0) {

zkqy-system/src/main/resources/mapper/dragmapper/DragTableMapper.xml

@@ -48,7 +48,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectDragTableVo">
         select t_id, dt_name, dt_nickname, table_key, sql_key, dt_table_name,time_format, dt_notes, dt_column_name, spare, spare1, del_flag, create_by, create_time, update_by, update_time, is_selection,menu_id,primary_key from drag_table
     </sql>
-
+    <sql id="selectDragTableVoOne">
+        select t_id, dt_name, dt_nickname, table_key, sql_key, dt_table_name,time_format, dt_notes, dt_column_name, spare, spare1, del_flag, create_by, create_time, update_by, update_time, is_selection,echo_data,menu_id,primary_key from drag_table
+    </sql>
     <select id="selectDragTableList" parameterType="com.zkqy.system.entity.DragTable" resultMap="DragTableResult">
         <include refid="selectDragTableVo"/>
         <where>
@@ -185,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectDragTableByTableKey" parameterType="String" resultMap="DragTableResult">
-        <include refid="selectDragTableVo"/>
+        <include refid="selectDragTableVoOne"/>
         where table_key = #{tableKey}
     </select>