Merge remote-tracking branch 'origin/master'

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -1683,8 +1683,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             String procDefId = flowTask.getProcDefId();
             String taskDefKey = flowTask.getTaskDefKey();
             ResultBean<List<SysProUrlVo>> listResultBean = sysProUrlService.selectUrlByKey(procDefId, taskDefKey, "1", "2");
-            SysProUrlVo data = listResultBean.getData().get(0);
-            flowTask.setSysProUrlVo(data);
+            if(listResultBean.getData()!=null&&listResultBean.getData().size()>0){
+                flowTask.setSysProUrlVo(listResultBean.getData().get(0));
+            }
             flowList.add(flowTask);
         }
         page.setRecords(flowList);

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java

@@ -178,7 +178,6 @@ public class SysProUrlService extends MybatisBaseService<SysProUrlMapper, SysPro
             return rb.success().setData(url);
         }
         return rb.setMsg("查询不到数据");
-
     }
 
     public ResultBean<String> add(SysProUrlDto dto) {