修改bug

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

@@ -2395,7 +2395,6 @@ public class ExcelTabController extends BladeController {
                                                 sdf.setTimeZone(TimeZone.getTimeZone("GTM+8"));
                                                 SimpleDateFormat formatStr = new SimpleDateFormat("yyyy年MM月dd日");
                                                 if (myData.indexOf(",") >= 0 && myData.indexOf("]") >= 0) {
-
                                                     myData = myData.replace("[", "").replace("]", "").replaceAll("'", "");
                                                     String[] dataVal = myData.split(",");
                                                     Date Start_dataStr = sdf.parse(dataVal[0]);

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

@@ -1210,9 +1210,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
             //表maps
             Map<String, String> sgTabMaps = new LinkedHashMap<>();
             Map<String, String> jlTabMaps = new LinkedHashMap<>();
-
             List<WbsTreeContract> tabs = baseMapper.selectList(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getParentId, node.getId())
-                    .select(WbsTreeContract::getNodeName, WbsTreeContract::getTableOwner, WbsTreeContract::getPKeyId, WbsTreeContract::getInitTableName, WbsTreeContract::getSort, WbsTreeContract::getFullName, WbsTreeContract::getUpdateTime)
                     .eq(WbsTreeContract::getContractId, node.getContractId()).eq(WbsTreeContract::getType, 2)
                     .eq(WbsTreeContract::getWbsId, node.getWbsId())
                     .apply("(wbs_type is null OR wbs_type = " + node.getWbsType() + ")")
@@ -1236,6 +1234,12 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                 if(sgName.indexOf("(")>=0||sgName.indexOf(")")>=0){
                     sgName = sgName.replaceAll("\\(.*?\\)", "");
                 }
+                if(sgName.indexOf("（")>=0||sgName.indexOf(")")>=0){
+                    sgName = sgName.replaceAll("\\（.*?\\)", "");
+                }
+                if(sgName.indexOf("(")>=0||sgName.indexOf("）")>=0){
+                    sgName = sgName.replaceAll("\\(.*?\\）", "");
+                }
                 if(sgName.indexOf("__")>0){
                     String[] sgNames = sgName.split("__");
                     CopyDto c=new CopyDto();
@@ -1253,6 +1257,12 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                 if(jlName.indexOf("(")>=0||jlName.indexOf(")")>=0){
                     jlName=jlName.replaceAll("\\(.*?\\)", "");
                 }
+                if(jlName.indexOf("（")>=0||jlName.indexOf(")")>=0){
+                    jlName = jlName.replaceAll("\\（.*?\\)", "");
+                }
+                if(jlName.indexOf("(")>=0||jlName.indexOf("）")>=0){
+                    jlName = jlName.replaceAll("\\(.*?\\）", "");
+                }
                 if(jlName.indexOf("__")>0){
                     String[] sgNames = jlName.split("__");
                     CopyDto c=new CopyDto();
@@ -1266,7 +1276,6 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
             if(sgList.size()>0){
                 //还需要添加的复制表
                 sgList.removeAll(jlList);
-                ArrayList<CopyDto> copyDtos = new ArrayList<>(sgList);
                 List<WbsTreeContract>list=new ArrayList<>();
                 for (WbsTreeContract jl : jlTab) {
                     String jlName = jl.getNodeName();
@@ -1278,6 +1287,12 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                         jlName=jlName.replaceAll("\\(.*?\\)", "");
                         jlName=StringUtils.deleteWhitespace(jlName);
                     }
+                    if(jlName.indexOf("（")>=0||jlName.indexOf(")")>=0){
+                        jlName = jlName.replaceAll("\\（.*?\\)", "");
+                    }
+                    if(jlName.indexOf("(")>=0||jlName.indexOf("）")>=0){
+                        jlName = jlName.replaceAll("\\(.*?\\）", "");
+                    }
                     if(jlName.indexOf("__")>=0){
                         String[] oldName = jlName.split("__");
                         jlName=oldName[0];
@@ -1311,6 +1326,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                     }
 
                 }
+                System.out.println(list.size());
                 this.saveBatch(list);
                 jlTab.addAll(list);
             }