Merge branch 'refs/heads/feature-lihb-20250731' into test-merge

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

@@ -130,7 +130,7 @@ public class NeiYeController {
                 queryVO.setSelectType(2);
             }
             //有些填报节点的MajorDataType为0
-            if (queryVO.getSelectType() == 1) {
+            if (queryVO.getSelectType() != null && queryVO.getSelectType() == 1) {
                 //非填报节点
                 if (node.getParentId() == 0) {
                     queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractIdTwo("", contractType, contractId, queryVO.getDateIsComplete());
@@ -611,7 +611,7 @@ public class NeiYeController {
 
 
     /**
-     * 导出行政区划数据
+     * 导出业内台账
      */
     @PostMapping("export")
     @ApiOperationSupport(order = 11)
@@ -623,7 +623,7 @@ public class NeiYeController {
         //获取数据
         if(iPageR.isSuccess()){
             List<NeiYeLedgerVO> list = iPageR.getData().getRecords();
-            ExcelUtil.export(response, "业内台账" + org.springblade.core.tool.utils.DateUtil.time(), "行政区划数据表", list, NeiYeLedgerVO.class);
+            ExcelUtil.export(response, "内业台账" + org.springblade.core.tool.utils.DateUtil.time(), "行政区划数据表", list, NeiYeLedgerVO.class);
         }
     }
 }