From 05c569f74a1c94b84145abe34f2b2385d68fdec6 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 23 五月 2024 01:21:54 +0800
Subject: [PATCH] 实现人员管理

---
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 887f325..78ec60d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -410,8 +410,6 @@
                                     delRSet.add(jo1.get("r") + "");
                                 }
                             }
-                        } else {
-                            if ("鍙傛暟".equals(v.get("v"))) delSet.add(jo1.get("c") + "");
                         }
                     }
                     for (int i = 0; i < temp.size(); i++) {
@@ -504,7 +502,6 @@
                         }
                         Style style = new Style();
                         style.setFontFamily(v.get("ff") == null ? "寰蒋闆呴粦" : v.get("ff") + "");
-//                        style.setFontSize(v.get("fs")==null?14:Integer.parseInt(v.get("fs")+""));
                         if (!((v.get("fc") + "").indexOf("rgb") > -1)) {
                             style.setColor(v.get("fc") == null ? "000000" : (v.get("fc") + "").replace("#", ""));
                         } else {
@@ -512,13 +509,10 @@
                         }
                         textRenderData.setStyle(style);
                         text.add(textRenderData);
-                        if (i == temp.size() - 1) {
-                            TextRenderData[] text2 = text.toArray(new TextRenderData[0]);
-                            rowRenderData = Rows.of(text2).rowAtleastHeight(1).center().create();
-                            rows.add(rowRenderData);
-                            text = new ArrayList<>();
-                        }
                     }
+                    TextRenderData[] text2 = text.toArray(new TextRenderData[0]);
+                    rowRenderData = Rows.of(text2).rowAtleastHeight(1).center().create();
+                    rows.add(rowRenderData);
                     TableRenderData tableRenderData = new TableRenderData();
                     tableRenderData.setRows(rows);
                     TableStyle tableStyle = new TableStyle();

--
Gitblit v1.9.3