修改bug

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

@@ -2367,6 +2367,7 @@ public class ExcelTabController extends BladeController {
 
                     if (ObjectUtil.isNotEmpty(dataMap)) {
                         for (String val : dataMap.keySet()) {
+                            boolean flag=false;
                             if (val.indexOf("__") >= 0) {
                                 String[] DataVal = val.split("__");
                                 String[] xy = DataVal[1].split("_");
@@ -2375,7 +2376,9 @@ public class ExcelTabController extends BladeController {
                                     Elements tdDatas = trData.select("td");
                                     if (tdDatas.size() > Integer.parseInt(xy[1])) {
                                         Element data = tdDatas.get(Integer.parseInt(xy[1]));
-
+                                        if(data.html().indexOf("date")>=0){
+                                            flag=true;
+                                        }
                                         if (data.html().indexOf("x1") >= 0 && data.html().indexOf("y1") >= 0) {
                                             int x1, y1;
 
@@ -2390,7 +2393,7 @@ public class ExcelTabController extends BladeController {
                                                 x1 = 1;
                                             }
                                             String myData = dataMap.get(val) + "";
-                                            if ((myData.indexOf("T") >= 0 && myData.indexOf("-") >= 0) || (myData.indexOf(",") >= 0 && myData.indexOf("]") >= 0)) {
+                                            if (((myData.indexOf("T") >= 0 && myData.indexOf("-") >= 0) || (myData.indexOf(",") >= 0 && myData.indexOf("]") >= 0))&&flag) {
                                                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
                                                 sdf.setTimeZone(TimeZone.getTimeZone("GTM+8"));
                                                 SimpleDateFormat formatStr = new SimpleDateFormat("yyyy年MM月dd日");

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

@@ -1242,8 +1242,10 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                 }
                 if(sgName.indexOf("__")>0){
                     String[] sgNames = sgName.split("__");
+                    String s=  StringUtils.deleteWhitespace(sgNames[0]);
+                    s= s.replaceAll("[^a-zA-Z0-9]", "");
                     CopyDto c=new CopyDto();
-                    c.setNodeName(StringUtils.deleteWhitespace(sgNames[0]));
+                    c.setNodeName(s);
                     c.setNum(Integer.parseInt(sgNames[1]));
                     sgList.add(c);
                 }
@@ -1264,10 +1266,12 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                     jlName = jlName.replaceAll("\\(.*?\\）", "");
                 }
                 if(jlName.indexOf("__")>0){
-                    String[] sgNames = jlName.split("__");
+                    String[] jlNames = jlName.split("__");
                     CopyDto c=new CopyDto();
-                    c.setNodeName(StringUtils.deleteWhitespace(sgNames[0]));
-                    c.setNum(Integer.parseInt(sgNames[1]));
+                    String s = StringUtils.deleteWhitespace(jlNames[0]);
+                    s= s.replaceAll("[^a-zA-Z0-9]", "");
+                    c.setNodeName(s);
+                    c.setNum(Integer.parseInt(jlNames[1]));
                     jlList.add(c);
                 }
 
@@ -1297,6 +1301,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                         String[] oldName = jlName.split("__");
                         jlName=oldName[0];
                     }
+                    jlName=jlName.replaceAll("[^a-zA-Z0-9]", "");
                     for (CopyDto copyDto : sgList) {
                         if(copyDto.getNodeName().equals(jlName)){
                             String name= jl.getNodeName()+"__"+ copyDto.getNum();
@@ -1326,7 +1331,6 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                     }
 
                 }
-                System.out.println(list.size());
                 this.saveBatch(list);
                 jlTab.addAll(list);
             }