Merge branch 'master' of http://175.27.169.173:10880/zkqy-sass-platform/mec-cloud_-intelligent-manufacturing_client

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

@@ -19,6 +19,7 @@ public class DragTree extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     private String  treeShowLabel;
+    private String  treeTableJoinTableCondition;
 
     /** 唯一标识符，自增主键 */
     private Long id;
@@ -248,4 +249,12 @@ public class DragTree extends BaseEntity
             .append("updateTime", getUpdateTime())
             .toString();
     }
+
+    public String getTreeTableJoinTableCondition() {
+        return treeTableJoinTableCondition;
+    }
+
+    public void setTreeTableJoinTableCondition(String treeTableJoinTableCondition) {
+        this.treeTableJoinTableCondition = treeTableJoinTableCondition;
+    }
 }

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

@@ -26,10 +26,11 @@
         <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"/>
     </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 from {DBNAME}.drag_tree
     </sql>
 
     <select id="selectDragTreeList" parameterType="com.zkqy.business.entity.DragTree" resultMap="DragTreeResult">