完善已办列表的url的查询

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskFeign.java

@@ -76,7 +76,7 @@ public interface FlowTaskFeign {
     @ApiOperation(value = "业务系统查询已办任务列表_移动端")
     @PostMapping("/businessDoneListForApp/{userSid}")
     @ResponseBody
-    ResultBean  businessDoneListForApp(@ApiParam(value = "当前用户sid") @PathVariable(value = "userSid")String userSid,
+    ResultBean<Page<FlowTaskDto>>   businessDoneListForApp(@ApiParam(value = "当前用户sid") @PathVariable(value = "userSid")String userSid,
                                 @RequestBody PagerQuery<BusinessTaskQuery> taskQueryPagerQuery);
 
     @ApiOperation(value = "流程历史流转记录")

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -35,7 +35,11 @@ import com.yxt.anrui.flowable.api.utils.ProcessStateEnum;
 import com.yxt.anrui.flowable.biz.flowtask.FlowTaskService;
 import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.api.sysuser.UserQuery;
 import com.yxt.common.base.utils.StringUtils;
@@ -83,7 +87,10 @@ public class FlowableRest implements FlowableFeign {
     private SysUserFeign sysUserFeign;
     @Resource
     protected TaskService taskService;
-
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
     @Override
     public ResultBean businessStart(BusinessVariables bv) {
         return flowableService.businessStart( bv);
@@ -182,7 +189,14 @@ public class FlowableRest implements FlowableFeign {
 
     @Override
     public ResultBean<UpdateFlowFieldVo> startProcess(BusinessVariables dto) {
+        String userSid = dto.getUserSid();
+        ResultBean<SysUserInfoVo> sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(userSid);
+        ResultBean<String> pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        String orgSid = pathSidByUserSid.getData();
+        ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgSid);
+
         ResultBean rb = ResultBean.fireFail();
+
         if (StringUtils.isBlank(dto.getBusinessSid())) {
             return  rb.setMsg("businessSid 不能为空！");
         }

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

@@ -118,7 +118,7 @@ public class FlowTaskController implements FlowTaskFeign {
         return flowTaskService.businessDoneListNew(userSid, taskQueryPagerQuery);
     }
     @Override
-    public ResultBean businessDoneListForApp(String userSid, PagerQuery<BusinessTaskQuery> taskQueryPagerQuery) {
+    public ResultBean<Page<FlowTaskDto>>   businessDoneListForApp(String userSid, PagerQuery<BusinessTaskQuery> taskQueryPagerQuery) {
         return flowTaskService.businessDoneListNewForApp(userSid, taskQueryPagerQuery);
     }
 

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

@@ -509,7 +509,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
      * @return
      */
     public ResultBean<Integer> getTodoNum(String userSid) {
-        long num = taskService.createTaskQuery().taskAssignee(userSid).count();
+        long num = taskService.createTaskQuery().taskAssigneeLike("%"+userSid+"%").count();
         return new ResultBean<Integer>().success().setData(Integer.parseInt(String.valueOf(num)));
     }
 
@@ -816,7 +816,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             flowTask.setProcessVariables(historicTaskInstance.getProcessVariables());
 
             ResultBean<List<SysProUrlVo>> listResultBean = sysProUrlService.selectUrlByKey(flowTask.getProcDefId(), flowTask.getTaskDefKey(), "2", "2");
-            flowTask.setSysProUrlVo(listResultBean.getData().get(0));
+            if(listResultBean.getData()!=null&&listResultBean.getData().size()>0){
+                flowTask.setSysProUrlVo(listResultBean.getData().get(0));
+            }
             // 设置手机端参数
 //            Map<String, Map<String, Object>> map = getAppOrPcVariables(flowTask);
 //            flowTask.setAppVariables(map.get("appVariables"));
@@ -1638,7 +1640,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         List<BusinessTaskParam> fields = taskQueryPagerQuery.getParams().getFields();
         return businessFinishedList(userSid, fields, current, size);
     }
-    public ResultBean businessDoneListNewForApp(String userSid, PagerQuery<BusinessTaskQuery> taskQueryPagerQuery) {
+    public ResultBean<Page<FlowTaskDto>>   businessDoneListNewForApp(String userSid, PagerQuery<BusinessTaskQuery> taskQueryPagerQuery) {
         int size = Integer.valueOf(taskQueryPagerQuery.getSize() + "");
         int current = Integer.valueOf(taskQueryPagerQuery.getCurrent() + "");
         List<BusinessTaskParam> fields = taskQueryPagerQuery.getParams().getFields();

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java

@@ -34,6 +34,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.anrui.portal.api.sysuser.SysUser;
 import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -163,6 +164,10 @@ public class FlowableRest implements FlowableFeign {
 
     @Override
     public ResultBean<Integer> getTodoNum(String userSid) {
+        ResultBean<Integer> rb=ResultBean.fireFail();
+        if(StringUtils.isBlank(userSid)){
+            return rb.setMsg("用户sid不能为空");
+        }
         return flowableService.getTodoNum(userSid);
     }