节点基础数据问题

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -253,6 +253,9 @@ public class InformationWriteQueryController extends BladeController {
                     }
                 }
                 if(contract!=null&&contract.getMajorDataType()!=null&&contract.getMajorDataType()==4){
+                    if(result==null){
+                        result="";
+                    }
                     if(query.getClassify()!=null&&query.getClassify()==1&&StringUtils.isNotEmpty(sgSuffix)){
                         result=result+sgSuffix;
                         if(!query.getName().equals(result)){

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

@@ -2068,8 +2068,10 @@ public class ExcelTabController extends BladeController {
     @PostMapping("/save_buss_data")
     @ApiOperationSupport(order = 13)
     @ApiOperation(value = "填报页面数据保存", notes = "填报页面数据保存")
-    public R saveBussData2(@Valid @RequestBody JSONObject dataInfo) throws Exception {
-
+    public R saveBussData2(@Valid @RequestBody JSONObject dataInfo,Boolean flag) throws Exception {
+        if(flag==null){
+            flag=true;
+        }
         ExecutionTime executionTime = new ExecutionTime();
         executionTime.info("----计划开始----");
         JSONArray dataArray = new JSONArray();
@@ -2130,7 +2132,7 @@ public class ExcelTabController extends BladeController {
         }
 
         //保存数据到数据库
-        R<Object> result = this.excelTabService.saveOrUpdateInfo(tableInfoList,singnType);
+        R<Object> result = this.excelTabService.saveOrUpdateInfo(tableInfoList,singnType,flag);
         RandomNumberHolder.RandomTemplateTypeclear();
         RandomNumberHolder.RandomWbsTreeContractclear();
         executionTime.info("----数据保存结束----");
@@ -2404,7 +2406,7 @@ public class ExcelTabController extends BladeController {
         //公式填充
         this.excelTabService.formulaFillData(tableInfoList, Long.parseLong(nodeId), ExecuteType.INSPECTION);
         //保存数据到数据库
-        R<Object> result = this.excelTabService.saveOrUpdateInfo(tableInfoList,"");
+        R<Object> result = this.excelTabService.saveOrUpdateInfo(tableInfoList,"",true);
         if (!result.isSuccess()) {
             R.fail(result.getMsg());
             return;
@@ -4776,7 +4778,7 @@ public class ExcelTabController extends BladeController {
                     js.put("signType", "1");
                 }*/
 
-                this.saveBussData2(js);
+                this.saveBussData2(js,true);
             }
         } catch (Exception e) {
             return null;

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

@@ -214,7 +214,7 @@ public class NodeBaseInfoController extends BladeController {
                 }
                 js2.put("orderList", array);
                 js.put("dataInfo", js2);
-                controller.saveBussData2(js);
+                controller.saveBussData2(js,false);
         } catch (Exception e) {
             return null;
         }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IExcelTabService.java

@@ -107,7 +107,7 @@ public interface IExcelTabService extends BaseService<ExcelTab> {
     /**
      * 结果信息持久化
      */
-    R<Object> saveOrUpdateInfo(List<TableInfo> tableInfoList,String singType) throws SQLException;
+    R<Object> saveOrUpdateInfo(List<TableInfo> tableInfoList,String singType,Boolean flag) throws SQLException;
 
     Map<String, String> getTablbCols(String pkeyid, String colkey) throws FileNotFoundException;
 

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

@@ -1217,7 +1217,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
     }
 
     @Override
-    public R<Object> saveOrUpdateInfo(List<TableInfo> tableInfoList,String sigType) {
+    public R<Object> saveOrUpdateInfo(List<TableInfo> tableInfoList,String sigType,Boolean flag) {
         List<TableInfo> tableInfoList2 = new ArrayList<>();
         String fileName1="";
         if (ListUtils.isNotEmpty(tableInfoList)) {
@@ -1301,10 +1301,13 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 
                         transactionManager1.commit(transactionStatus);
                     } catch (Exception e) {
-                        transactionManager1.rollback(transactionStatus);
-                        log.append(e.getMessage()).append("@@");
-                        e.printStackTrace();
-                        return R.fail(reason(e.getMessage()));
+                        //是否回滚
+                        if(flag){
+                            transactionManager1.rollback(transactionStatus);
+                            log.append(e.getMessage()).append("@@");
+                            e.printStackTrace();
+                            return R.fail(reason(e.getMessage()));
+                        }
                     }
                 }
 

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

@@ -246,7 +246,7 @@ public class WbsParamServiceImpl extends BaseServiceImpl<WbsParamMapper, WbsPara
                         result.add(param);
                     }
                     //如果是全局的也加进去
-                    if(param.getNameType()==1){
+                    if(param.getNameType()!=null&&param.getNameType()==1){
                         result.add(param);
                     }
                 }