清表有数据不回显项目名

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

@@ -864,6 +864,7 @@ public class ExcelTabController extends BladeController {
         //这句代码在正式环境要加上
 
         if (Func.isNotEmpty(dataInfo) && dataInfo.getTabType() != null && dataInfo.getTabType() != 100L) {
+            int x=0;
             for (int i = 1; i < 6; i++) {
                 Element tr = trs.get(i);
                 Elements tds = tr.select("td");
@@ -873,8 +874,9 @@ public class ExcelTabController extends BladeController {
                     if (style.indexOf("font-size") >= 0) {
                         int fontsize = Integer.parseInt(style.substring(style.indexOf("font-size:") + 10, style.indexOf(".0pt")));
                         if (isWater) {
-                            if (StringUtils.isNotEmpty(data.text()) && fontsize >= 12) {
+                            if (StringUtils.isNotEmpty(data.text()) && fontsize >= 12&&x<=0) {
                                 trs.get(i - 1).select("td").get(0).text(projectInfo.getProjectName());
+                                x=x+1;
                             }
                         } else {
                             if (StringUtils.isNotEmpty(data.text()) && fontsize >= 14) {

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

@@ -174,6 +174,7 @@ public class ServicePlanServiceImpl extends BaseServiceImpl<ServicePlanMapper, S
             Boolean isWater = false;
             // 添加标题显示
             Elements trs = table.select("tr");
+            int x=0;
             for (int i = 1; i < 6; i++) {
                 Element tr = trs.get(i);
                 Elements tds = tr.select("td");
@@ -193,7 +194,7 @@ public class ServicePlanServiceImpl extends BaseServiceImpl<ServicePlanMapper, S
                                 element = trs.get(i - 1).select("td").get(0);
                             }
                         }
-                        if (element != null && Func.isNotEmpty(element)) {
+                        if (element != null && Func.isNotEmpty(element)&&x<=0) {
                             //
                             Elements allElements = element.children();
                             if (allElements.size() >= 1) {
@@ -202,9 +203,11 @@ public class ServicePlanServiceImpl extends BaseServiceImpl<ServicePlanMapper, S
                                     element.text(defText);
                                 } else {
                                     element.text(projectInfo.getProjectName());
+                                    x+=1;
                                 }
                             } else {
                                 element.text(projectInfo.getProjectName());
+                                x+=1;
                             }
                         }
                     }