解决质检表单重复显示问题和电签预览pdf上出现电签id问题

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -4544,7 +4544,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                             newStyle.cloneStyleFrom(cell.getCellStyle());
                             newStyle.setFont(redFont);
                             newStyle.setShrinkToFit(true);
-                            //cell.setCellStyle(newStyle);
+                            cell.setCellStyle(newStyle);
                             if(dqid.contains("||")){
                                 String[] split = dqid.split("\\|\\|");
                                 for (String singleDqid : split) {

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -804,9 +804,13 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
             sortedTabs.add(tabWithoutKeyword);
             String tabName = tabWithoutKeyword.getNodeName();
             String tabNameWithKeywordPrefix = tabName + keyword;
-            for (AppWbsTreeContractVO tabWithKeyword : tabsWithKeyword) {
+            Iterator<AppWbsTreeContractVO> iterator = tabsWithKeyword.iterator();
+            while (iterator.hasNext()) {
+                AppWbsTreeContractVO tabWithKeyword = iterator.next();
                 if (tabWithKeyword.getNodeName().startsWith(tabNameWithKeywordPrefix)) {
                     sortedTabs.add(tabWithKeyword);
+                    // 移除已添加的
+                    iterator.remove();
                 }
             }
         }