Merge remote-tracking branch 'origin/master'

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -753,8 +753,8 @@
         iq.wbs_id,
         t.id as task_id,
         iq.sj_record_ids
-        from u_information_query iq left join (select * from u_task k where k.status!=3 and k.contract_id =
-        #{query.contractId} group by
+        from u_information_query iq left join (select * from u_task k where k.status!=3 and k.project_id =
+        #{query.projectId} group by
         form_data_id) t on iq.id = t.form_data_id and t.is_deleted = 0
         where
         iq.is_deleted = 0

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

@@ -1944,6 +1944,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 }
             }
             String sql = "update u_information_query set pdf_url ='" + bladeFile.getLink() + "' , sort = " + sort +",e_visa_pdf_url = null" +" where classify='" + classify + "' and  wbs_id='" + nodeId + "' and contract_id ='" + contractId + "' ";
+            System.out.println(sql);
             jdbcTemplate.execute(sql);
         }
     }