Merge branch 'master' of http://219.151.185.227:3000/zhuwei/bladex into lihb

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

@@ -330,6 +330,7 @@ public class EVDataServiceImpl implements EVDataService {
                     updateSql = "update u_information_query set e_visa_pdf_url='" + taskApp.getLastFilePdfUrl() + "',status=" + taskApp.getSigType() + " where id='" + taskApp.getFormDataId() + "'";
                 }
                 this.jdbcTemplate.execute(updateSql);
+                System.out.println("u_information_query修改语句："+updateSql);
                 this.jdbcTemplate.execute("update u_task_parallel set e_visa_status=1,e_visa_content='" + taskApp.getSignSmg() + "' , status=2 , initiative=2 ,update_time=SYSDATE() where parallel_process_instance_id in(" + taskApp.getParallelProcessInstanceId() + ")");
                 this.jdbcTemplate.execute("update u_task set status=" + taskApp.getSigType() + " ,update_time=SYSDATE() where id='" + taskApp.getTaskId() + "'");
                 this.jdbcTemplate.execute("delete from u_task_batch where id in(" + taskApp.getId()+")");

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

@@ -2859,7 +2859,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             //处理key重复导致pdf数据错位
             for (Iterator<Map.Entry<String, Object>> iterator = reData.entrySet().iterator(); iterator.hasNext(); ) {
                 Map.Entry<String, Object> entry = iterator.next();
-                if (!keyNames.equals("") && keyNames.indexOf(entry.getKey()) <= 0) {
+                if (!keyNames.equals("") && keyNames.indexOf(entry.getKey()) <0) {
                     iterator.remove();
                 }
             }