Kaynağa Gözat

后管关联元素, 未匹配字段2

qianxb 2 yıl önce
ebeveyn
işleme
e851620f00

+ 1 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -855,7 +855,7 @@ public class ExcelTabController extends BladeController {
         ProjectInfo projectInfo = projectInfoService.getById(wbsTreePrivate.getProjectId());
         // 添加标题显示
         Elements trs = table.select("tr");
-        for (int i = 0; i < 6; i++) {
+        for (int i = 1; i < 6; i++) {
             Element tr = trs.get(i);
             Elements tds = tr.select("td");
             for (int j = 0; j < tds.size(); j++) {

+ 1 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ExcelTabMapper.xml

@@ -206,7 +206,7 @@
     </select>
     <select id="getUnMatchField" resultType="org.springblade.manager.entity.WbsFormElement">
         select * from m_wbs_form_element
-        WHERE f_id = #{tabId} and e_name not in
+        WHERE f_id = #{tabId}  and is_deleted = 0 and e_name not in
         <foreach collection="set" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>