元素显示bug

blade-service/blade-manager/src/main/java/com/mixsmart/utils/CustomFunction.java

@@ -496,6 +496,10 @@ public class CustomFunction {
 	}
 
 
+	public Object proportion(){
+         return "";
+	}
+
 	/**
 	 * @Description 时间比较获取
 	 * @Param [list：时间集合, comparator 比较器 ]

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeMapper.xml

@@ -375,8 +375,8 @@
     <select id="selectFormElements4TableId" resultMap="wbsFormElementMap">
         select f_id,e_key,c.id,e_name,e_type,e_length,e_allow_deviation,e_Inspection_method,CONCAT(b.init_table_name,':',e_key) as tableElementKey,init_table_name as initTableName, b.parent_id as nodeId from m_table_info a INNER JOIN m_wbs_tree b on a.tab_en_name=b.init_table_name INNER JOIN m_wbs_form_element c on c.f_id=b.init_table_id
         where a.id =#{id} and c.is_deleted=0
-        union all  select f_id,e_key,c.id,e_name,e_type,e_length,e_allow_deviation,e_Inspection_method,CONCAT(b.init_table_name,':',e_key) as tableElementKey,init_table_name as initTableName, b.parent_id as nodeId from m_table_info a INNER JOIN m_wbs_tree_private b on a.tab_en_name=b.init_table_name INNER JOIN m_wbs_form_element c on c.f_id=b.init_table_id
-        where a.id =#{id} and c.is_deleted=0
+        union   select f_id,e_key,c.id,e_name,e_type,e_length,e_allow_deviation,e_Inspection_method,CONCAT(b.init_table_name,':',e_key) as tableElementKey,init_table_name as initTableName, b.parent_id as nodeId from m_table_info a INNER JOIN (SELECT j.* from m_table_info k INNER JOIN m_wbs_tree_private j on k.tab_en_name=j.init_table_name
+        where k.id=#{id} limit 1) b on a.tab_en_name=b.init_table_name INNER JOIN m_wbs_form_element c on c.f_id=b.init_table_id  where a.id =#{id} and c.is_deleted=0
     </select>
 
     <select id="selectPrivateFormElements" resultMap="wbsFormElementMap">