树形接口实体类增加

zkqy-system/src/main/java/com/zkqy/system/entity/DragTree.java

@@ -18,6 +18,9 @@ public class DragTree extends BaseEntity
 
     private  String treeShowLabel;
 
+    private String  treeTableJoinTableCondition;
+    private String  treeTableJoinTablePrimaryKey;
+
     public String getTreeShowLabel() {
         return treeShowLabel;
     }
@@ -247,4 +250,20 @@ public class DragTree extends BaseEntity
             .append("updateTime", getUpdateTime())
             .toString();
     }
+
+    public String getTreeTableJoinTableCondition() {
+        return treeTableJoinTableCondition;
+    }
+
+    public void setTreeTableJoinTableCondition(String treeTableJoinTableCondition) {
+        this.treeTableJoinTableCondition = treeTableJoinTableCondition;
+    }
+
+    public String getTreeTableJoinTablePrimaryKey() {
+        return treeTableJoinTablePrimaryKey;
+    }
+
+    public void setTreeTableJoinTablePrimaryKey(String treeTableJoinTablePrimaryKey) {
+        this.treeTableJoinTablePrimaryKey = treeTableJoinTablePrimaryKey;
+    }
 }

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

@@ -26,10 +26,12 @@
         <result property="tableNameDes" column="table_name_des"/>
         <result property="treeTableKey" column="tree_table_key"/>
         <result property="treeShowLabel" column="tree_show_label"/>
+        <result property="treeTableJoinTableCondition" column="tree_table_join_table_condition"/>
+        <result property="treeTableJoinTablePrimaryKey" column="tree_table_join_table_primary_key"/>
     </resultMap>
 
     <sql id="selectDragTreeVo">
-        select id, menu_id, menu_name, tree_desc, tree_table_name, tree_table_primary_key, tree_table_dgl, tree_table_condition, tree_table_join_table, table_name_des, del_flag, create_by, create_by_id, create_time, update_by, update_by_id, update_time,table_id,tree_table_key,tree_show_label from {DBNAME}.drag_tree
+        select id, menu_id, menu_name, tree_desc, tree_table_name, tree_table_primary_key, tree_table_dgl, tree_table_condition, tree_table_join_table, table_name_des, del_flag, create_by, create_by_id, create_time, update_by, update_by_id, update_time,table_id,tree_table_key,tree_show_label,tree_table_join_table_condition,tree_table_join_table_primary_key from {DBNAME}.drag_tree
     </sql>
 
     <select id="selectDragTreeList" parameterType="com.zkqy.system.entity.DragTree" resultMap="DragTreeResult">
@@ -46,8 +48,12 @@
             <if test="tableNameDes != null  and tableNameDes != ''"> and table_name_des = #{tableNameDes}</if>
             <if test="createById != null "> and create_by_id = #{createById}</if>
             <if test="updateById != null "> and update_by_id = #{updateById}</if>
-            <if test="tableId != null">and table_id=#{tableId},</if>
+            <if test="tableId != null">and table_id=#{tableId}</if>
             <if test="treeTableKey!=null">and tree_table_key=#{treeTableKey}</if>
+            <if test="treeShowLabel!=null">and tree_show_label=#{treeShowLabel}</if>
+            <if test="treeTableJoinTableCondition!=null">and tree_table_join_table_condition=#{treeTableJoinTableCondition}</if>
+            <if test="treeTableJoinTablePrimaryKey!=null">and tree_table_join_table_primary_key=#{treeTableJoinTablePrimaryKey}</if>
+
         </where>
     </select>
 
@@ -78,7 +84,8 @@
             <if test="tableId != null">table_id,</if>
             <if test="treeTableKey!=null">tree_table_key,</if>
             <if test="treeShowLabel!=null">tree_show_label,</if>
-
+            <if test="treeTableJoinTableCondition!=null">tree_table_join_table_condition,</if>
+            <if test="treeTableJoinTablePrimaryKey!=null">tree_table_join_table_primary_key,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="menuId != null">#{menuId},</if>
@@ -100,6 +107,8 @@
             <if test="tableId != null">#{tableId},</if>
             <if test="treeTableKey!=null">#{treeTableKey},</if>
             <if test="treeShowLabel!=null">#{treeShowLabel},</if>
+            <if test="treeTableJoinTableCondition!=null">#{treeTableJoinTableCondition},</if>
+            <if test="treeTableJoinTablePrimaryKey!=null">#{treeTableJoinTablePrimaryKey},</if>
         </trim>
     </insert>
 
@@ -123,8 +132,10 @@
             <if test="updateById != null">update_by_id = #{updateById},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="tableId != null">table_id=#{tableId},</if>
-            <if test="treeTableKey!=null">tree_table_key=#{treeTableKey}</if>
+            <if test="treeTableKey!=null">tree_table_key=#{treeTableKey},</if>
             <if test="treeShowLabel!=null">tree_show_label=#{treeShowLabel},</if>
+            <if test="treeTableJoinTableCondition!=null">tree_table_join_table_condition=#{treeTableJoinTableCondition},</if>
+            <if test="treeTableJoinTablePrimaryKey!=null">tree_table_join_table_primary_key=#{treeTableJoinTablePrimaryKey},</if>
         </trim>
         where id = #{id}
     </update>