签字提交

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/controller/EVController.java

@@ -81,7 +81,9 @@ public class EVController {
         if (query != null && query.size() >= 1) {
             for (TaskSignInfoVO dataInfo : query) {
                 if(dataInfo.getSigType() == 2 && dataInfo.getIsSignature() > 0){
-                    continue;
+                    if(dataInfo.getApprovalType()!=5){
+                        continue;
+                    }
                 }
                 if (executor.getQueue().size() <= 20) {
                     Boolean aBoolean = RedisTemplate.hasKey("sign-" + dataInfo.getFormDataId());
@@ -89,7 +91,7 @@ public class EVController {
                         if (dataInfo.getSigType() == 2) {
                             String sql12 = "SELECT a.* from u_task a,u_task_parallel b where a.process_instance_id=b.process_instance_id and b.initiative=1 and  a.is_deleted=0 and b.is_deleted=0 and a.`status` in(1,2) and a.id='" + dataInfo.getTaskId() + "'";
                             List<Map<String, Object>> maps12 = jdbcTemplate.queryForList(sql12);
-                            if (maps12 != null && maps12.size() >= 1) {
+                            if (maps12 != null && maps12.size() >= 1&& dataInfo.getApprovalType()!=5) {
                                 jdbcTemplate.execute("delete from u_task_batch where id in(" + dataInfo.getId() + ")");
                                 aBoolean = true;
                             }