解决保存标题报错问题

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

@@ -29,6 +29,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.manager.entity.*;
 import org.springblade.manager.feign.*;
+import org.springblade.manager.vo.ExecutionTime;
 import org.springblade.system.cache.ParamCache;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
@@ -341,6 +342,7 @@ public class EVisaTaskCheckController {
     })
     public R<IPage<FixedFlowVO>> queryFixedFlow(@RequestBody JSONObject json) {
         //获取所有流程
+        ExecutionTime executionTime = new ExecutionTime();
         FixedFlowVO vo = new FixedFlowVO();
         vo.setCurrent(1);
         vo.setSize(100);
@@ -376,7 +378,7 @@ public class EVisaTaskCheckController {
             return R.fail(300, "未找到符合电签配置的相关流程，请重新保存再上报");
         }
 
-
+        executionTime.info("d第一阶段结束");
         //汇总电签配置的审批角色
         List<String> eVisaRoleList = jsonList.stream().map(jsonObject -> jsonObject.getString("sigRoleId")).distinct().collect(Collectors.toList());
         List<User> users = userClient.selectUserAll();
@@ -441,7 +443,7 @@ public class EVisaTaskCheckController {
                 }
             }
         }
-
+        executionTime.info("第二阶段结束");
         //设置流程
         flowPage.setRecords(flowList);
 

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

@@ -2986,8 +2986,10 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             if (xx >= all) {
                 int fisRow = mergedCell.getFirstRow();
                 int firsrCol = mergedCell.getFirstColumn();
-
                 Cell cell = sheet.getRow(fisRow).getCell(firsrCol);
+                if(cell==null){
+                    continue;
+                }
                 short fontIndex = cell.getCellStyle().getFontIndex();
 
                 Font oldfontAt = workbook.getFontAt(fontIndex);