Merge remote-tracking branch 'origin/master'

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

@@ -374,8 +374,7 @@
         where b.id=#{id} and a.is_deleted=0
     </select>
     <select id="selectFormElements4TableId" resultMap="wbsFormElementMap">
-        select  a.id,a.e_name,IF(b.formula_id>0,1,0)globalFormula from m_wbs_form_element a LEFT JOIN (select element_id ,formula_id from m_element_formula_mapping where scope=1 )b on a.id=b.element_id
-        where a.f_id=#{id} and a.is_deleted=0
+        select b.id,IF(c.formula_id>0,1,0)globalFormula ,b.e_name,e_type,e_length,e_allow_deviation,e_Inspection_method,CONCAT(a.tab_en_name,':',e_key) as tableElementKey,a.tab_en_name as initTableName from (select * from m_table_info where id=#{id}) a INNER JOIN  m_wbs_form_element b on a.id =b.f_id LEFT JOIN(select element_id ,formula_id from m_element_formula_mapping where scope=1 )c on b.id=c.element_id  where b.is_deleted=0
     </select>
     <select id="selectPrivateFormElements" resultMap="wbsFormElementMap">
         select  * from m_wbs_form_element a