档案文件排序修改

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/ArchiveFileServiceImpl.java

@@ -177,10 +177,10 @@ public class ArchiveFileServiceImpl extends BaseServiceImpl<ArchiveFileMapper, A
                 }
             }
             //循环查看是否把需要审批改为不需要审批，  不可能把不需要审批改为需要审批 ,0不需要，1需要
-            if (vo.getStatus() == 0 && vo.getIsApproval() == 0) {
+            if (vo.getStatus() != null && vo.getStatus() == 0 && vo.getIsApproval() != null &&  vo.getIsApproval() == 0) {
                 vo.setStatus(2);
             }
-            if(vo.getIsApproval() == 1){
+            if(vo.getIsApproval() != null && vo.getIsApproval() == 1){
                 Set<String> aopParamsSet = new HashSet<>();
                 //判断现在的数据是否是待审批数据，只有上报状态、未认证状态的数据才能撤销
                 ArchiveFile archiveFile = jdbcTemplate.queryForObject("select * from u_archive_file where id = " + vo.getId(), new BeanPropertyRowMapper<>(ArchiveFile.class));