自动组卷

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

@@ -342,14 +342,14 @@ public class ArchivesAutoController extends BladeController {
 			archivesAutoService.archiveAutoMethod(projectId);
 			//刷新项目档号
 			archivesAutoService.refreshFileNumberNoSlipt(projectId,contractId,nodeId);
-
+			//设置自动组卷结束
+			projectClient.updateIsArchivesAutoById(projectId,0);
 			return R.data("自动组卷结束");
 		}catch (Exception e){
 			e.printStackTrace();
-			return R.fail(e.getMessage());
-		}finally {
 			//设置自动组卷结束
 			projectClient.updateIsArchivesAutoById(projectId,0);
+			return R.fail(e.getMessage());
 		}
 
 	}

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -144,13 +144,13 @@
                 select id from u_archives_auto where project_id=#{projectId}
                   and is_auto_file!=1
                   and is_deleted=0
-                  and is_lock=0
+                  and is_lock!=1
             );
         /**把未锁定案卷去掉*/
         update u_archives_auto set is_deleted=1 where project_id=#{projectId}
             and is_auto_file!=1
             and is_deleted=0
-            and is_lock=0;
+            and is_lock!=1;
     </update>
 
     <select id="getFilePageUrlList" resultType="java.lang.String">