Merge remote-tracking branch 'origin/test-merge' into test-merge

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileController.java

@@ -157,7 +157,7 @@ public class ArchiveFileController extends BladeController {
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "分页")
     public R<Object> page(ArchiveFileVO queryVo) {
-        if (queryVo.getNodeIds().isEmpty() || queryVo.getNodeIds().equals("")) {
+        if (StringUtils.isEmpty(queryVo.getNodeIds())) {
 
         } else {
             ArchiveTreeContract rootNode = this.archiveTreeContractClient.getArchiveTreeContractById(Long.parseLong(queryVo.getNodeIds()));
@@ -171,10 +171,10 @@ public class ArchiveFileController extends BladeController {
 //                ids.add(queryVo.getNodeIds());
 //                queryVo.setNodeIdArray(ids);
 //            }
-            //优化
-            String authCode = this.archiveTreeContractClient.getAuthCode(queryVo.getContractId() == null ? null : Long.parseLong(queryVo.getContractId()));
-            queryVo.setAuthCode(authCode);
         }
+        //优化
+        String authCode = this.archiveTreeContractClient.getAuthCode(queryVo.getContractId() == null ? null : Long.parseLong(queryVo.getContractId()));
+        queryVo.setAuthCode(authCode);
         return R.data(this.archiveFileClient.selectArchiveFilePage(queryVo));
     }
 

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -700,6 +700,7 @@ public class ArchivesAutoController extends BladeController {
 			}
 			archiveFileClient.updateArchiveFile(updateArchiveFileList);
 			auto.setName(name);
+			auto.setFileN(archiveFileList.size());
 			//删除其他案卷
 			archivesAutoList.remove(auto);
 			archivesAutoService.deleteLogic(archivesAutoList.stream().map(o->o.getId()).collect(Collectors.toList()));

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVDataServiceImpl.java

@@ -343,7 +343,7 @@ public class EVDataServiceImpl implements EVDataService {
                         }
                     }
                     //电签成功后需要将check_status改为1,进行电签检测
-                    String updateCheckStatus="update  u_information_query set chck_status=1 where id='" + taskApp.getFormDataId() + "' and chek_status!=0 ";
+                    String updateCheckStatus="update  u_information_query set chek_status=1 where id='" + taskApp.getFormDataId() + "' and chek_status!=0 ";
                     jdbcTemplate.execute(updateCheckStatus);
                     updateSql = "update u_information_query set pdf_trial_url_position='" + pdfTrialUrlPosition + "',business_time='" + taskApp.getPdfDate() + "',node_pdf_url='" + nodePdfUrl + "',e_visa_pdf_page=" + pdfPage + ",e_visa_pdf_size=" + pdfSize + ",e_visa_pdf_url='" + taskApp.getLastFilePdfUrl() + "',status='" + taskApp.getSigType() + "',update_time=SYSDATE() where id='" + taskApp.getFormDataId() + "' ";
                     //修改 计量 需要引用的 附件信息