完善flowable,分公司查询

anrui-base/anrui-base-ui/.env.development

@@ -6,4 +6,4 @@ VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
 ##VUE_APP_URL = "http://26077a35f5.wicp.vip"
-VUE_APP_URL = "http://anrui.yyundong.com"
+VUE_APP_URL = "http://127.0.0.1:8111"

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java

@@ -35,12 +35,12 @@ public class FlowableFallback implements FlowableFeign {
     }
 
     @Override
-    public ResultBean getNextNodeUserSidsOfCreate(BusinessVariables bv ) {
+    public ResultBean<UserAndOrgPath> getNextNodeUserSidsOfCreate(BusinessVariables bv ) {
         return null;
     }
 
     @Override
-    public ResultBean getNextNodeUserSidsOfSubmit(BusinessVariables bv ) {
+    public ResultBean<UserAndOrgPath> getNextNodeUserSidsOfSubmit(BusinessVariables bv ) {
         return null;
     }
 

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java

@@ -78,7 +78,7 @@ public interface FlowableFeign {
     @ApiOperation(value = "创建流程实例时取下一环节的用户sid")
     @GetMapping(value = "/getNextNodeUserSidsOfCreate")
     @ResponseBody
-    ResultBean<String> getNextNodeUserSidsOfCreate( @RequestBody BusinessVariables bv);
+    ResultBean<UserAndOrgPath> getNextNodeUserSidsOfCreate( @RequestBody BusinessVariables bv);
     /**
      * 提交流程实例时取下一环节的用户sid
      *
@@ -87,7 +87,7 @@ public interface FlowableFeign {
     @ApiOperation(value = "提交流程实例时取下一环节的用户sid")
     @GetMapping(value = "/getNextNodeUserSidsOfSubmit")
     @ResponseBody
-    ResultBean getNextNodeUserSidsOfSubmit(@RequestBody BusinessVariables bv);
+    ResultBean<UserAndOrgPath> getNextNodeUserSidsOfSubmit(@RequestBody BusinessVariables bv);
 
     @ApiOperation(value = "启动流程")
     @PostMapping(value = "/startProcess")

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/UserAndOrgPath.java

@@ -0,0 +1,15 @@
+package com.yxt.anrui.flowable.api.flow;
+
+import lombok.Data;
+
+@Data
+public class UserAndOrgPath {
+    /**
+     * 用户sid
+     */
+    private String userSid;
+    /**
+     * 组织及部门sid全路径
+     */
+    private String orgPath;
+}

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

@@ -63,6 +63,11 @@ public interface FlowTaskFeign {
     @GetMapping("/getTodoNum/{userSid}")
     ResultBean<Integer> getTodoNum(@PathVariable(value = "userSid")String userSid);
 
+    @ApiOperation(value = "业务系统查询待办任务列表数量")
+    @GetMapping("/getTodoNum/{userSid}/{orgPath}")
+    ResultBean<Integer> getTodoNum(@PathVariable(value = "userSid")String userSid,
+                                   @PathVariable(value = "orgPath")String orgPath);
+
     @ApiOperation(value = "已办任务列表")
     @PostMapping("/doneList")
     @ResponseBody

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

@@ -56,6 +56,11 @@ public class FlowTaskFeignFallBack implements FlowTaskFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<Integer> getTodoNum(String userSid, String orgPath) {
+        return null;
+    }
+
     @Override
     public ResultBean doneList(PagerQuery<FlowTaskQuery> taskQueryPagerQuery) {
         return null;

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessVariables.java

@@ -18,6 +18,10 @@ import java.util.Map;
 @AllArgsConstructor
 @NoArgsConstructor
 public class BusinessVariables {
+    /**
+     * 分公司sid
+     */
+    public  static final String ORGPATH="orgPath";
     /**
      * 流程定义的id
      */

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

@@ -113,7 +113,7 @@ public class FlowableRest implements FlowableFeign {
     }
 
     @Override
-    public ResultBean<String> getNextNodeUserSidsOfCreate(BusinessVariables bv) {
+    public ResultBean<UserAndOrgPath> getNextNodeUserSidsOfCreate(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         String orgSidPath=bv.getOrgSidPath();
         String orgPath = bv.getOrgPath();
@@ -130,7 +130,8 @@ public class FlowableRest implements FlowableFeign {
         return getNextUserSids(rb, orgSidPath, o,orgPath);
     }
 
-    private ResultBean getNextUserSids(ResultBean rb, String orgSidPath, Object o,String orgPath) {
+    private ResultBean< UserAndOrgPath> getNextUserSids(ResultBean rb, String orgSidPath, Object o,String orgPath) {
+        UserAndOrgPath mapParam=new UserAndOrgPath();
         JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(o));
         String roleSid = jsonArray.get(0).toString();
         //根据组织架构、角色两个参数取相关符合条件的用户信息
@@ -143,20 +144,26 @@ public class FlowableRest implements FlowableFeign {
             return rb.fail().setMsg("环节没有用户");
         }
         StringBuilder nextNodeUserSids = new StringBuilder();
+        StringBuilder nextNodeOrgPathSids = new StringBuilder();
         for (SysUserVo su : sysUserVos) {
             nextNodeUserSids.append(su.getSid()).append(",");
+            nextNodeOrgPathSids.append(su.getOrgSidPath()).append(",");
         }
         //符合条件的用户的sid,拼接的字符串
         String nextNodeUserSids_ = nextNodeUserSids.toString();
+        String nextNodeOrgPathSids_ = nextNodeOrgPathSids.toString();
         if(StringUtils.isBlank(nextNodeUserSids_))
             return   rb.fail().setMsg("环节没有用户");
         nextNodeUserSids_ = nextNodeUserSids_.substring(0, nextNodeUserSids_.length() - 1);
-        return rb.success().setData(nextNodeUserSids_);
+        nextNodeOrgPathSids_ = nextNodeOrgPathSids_.substring(0, nextNodeOrgPathSids_.length() - 1);
+        mapParam.setUserSid(nextNodeUserSids_);
+        mapParam.setOrgPath(nextNodeOrgPathSids_);
+        return rb.success().setData(mapParam);
     }
 
     @Override
-    public ResultBean getNextNodeUserSidsOfSubmit(BusinessVariables bv) {
-        ResultBean rb = ResultBean.fireSuccess();
+    public ResultBean<UserAndOrgPath> getNextNodeUserSidsOfSubmit(BusinessVariables bv) {
+        ResultBean<UserAndOrgPath> rb = ResultBean.fireSuccess();
         String orgSidPath=bv.getOrgSidPath();
         String taskDefKey=bv.getTaskDefKey();
         String orgPath = bv.getOrgPath();
@@ -175,7 +182,7 @@ public class FlowableRest implements FlowableFeign {
         }
         if(endTask){
             task_map.put("name","结束");
-            return rb.setData("");
+            return rb.setData(new UserAndOrgPath());
         }else{
             Object o = task_map.get("candidateGroups");
             return getNextUserSids(rb, orgSidPath, o,orgPath);
@@ -195,12 +202,13 @@ public class FlowableRest implements FlowableFeign {
         dto.getFormVariables().put("businessSid",dto.getBusinessSid());
         String nextNodeUserSids_ = dto.getNextNodeUserSids();
         if(StringUtils.isBlank(nextNodeUserSids_)){
-            ResultBean<String> nextNodeUserSidsOfCreate = getNextNodeUserSidsOfCreate(dto);
+            ResultBean<UserAndOrgPath> nextNodeUserSidsOfCreate = getNextNodeUserSidsOfCreate(dto);
             boolean success = nextNodeUserSidsOfCreate.getSuccess();
             if(!success){
                 return rb.setMsg(nextNodeUserSidsOfCreate.getMsg());
             }
-            nextNodeUserSids_=nextNodeUserSidsOfCreate.getData();
+            nextNodeUserSids_=nextNodeUserSidsOfCreate.getData().getUserSid();
+            dto.getFormVariables().put("orgPath",nextNodeUserSidsOfCreate.getData().getOrgPath());
         }
         dto.setNextNodeUserSids(nextNodeUserSids_);
         ResultBean resultBean1 = flowableService.businessStart(dto);
@@ -252,11 +260,12 @@ public class FlowableRest implements FlowableFeign {
 
         String nextUserSid = dto.getNextNodeUserSids();
         if(StringUtils.isBlank(nextUserSid)){
-            ResultBean<String> nextNodeUserSidsOfSubmit = getNextNodeUserSidsOfSubmit(dto);
+            ResultBean<UserAndOrgPath> nextNodeUserSidsOfSubmit = getNextNodeUserSidsOfSubmit(dto);
             if (!nextNodeUserSidsOfSubmit.getSuccess()) {
                 return rb.setMsg("nextUserSid 不能为空！");
             }
-            nextUserSid=nextNodeUserSidsOfSubmit.getData();
+            nextUserSid=nextNodeUserSidsOfSubmit.getData().getUserSid();
+            formVariables.put("orgPath",nextNodeUserSidsOfSubmit.getData().getOrgPath());
         }
         String comment = dto.getComment();
         if (StringUtils.isBlank(comment)) {

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

@@ -16,6 +16,7 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.ApiParam;
+import org.flowable.engine.TaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -32,6 +33,8 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
     private FlowDefinitionService flowDefinitionService;
     @Autowired
     private FlowTaskService flowTaskService;
+    @Autowired
+    private TaskService taskService;
 
     public ResultBean<FlowProcinst> getFlowProcinstById(String  id) {
         ResultBean<FlowProcinst> rb =ResultBean.fireFail();
@@ -42,7 +45,6 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         return rb.success().setData(fp);
     }
     public ResultBean businessStart(BusinessVariables bv) {
-
         if (StringUtils.isBlank(bv.getBusinessSid())) {
             return ResultBean.fireFail().setMsg("businessSid 不能为空！");
         }
@@ -66,6 +68,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         map.put("procInsId", rb.getData().getProcInsId());
         map.put("taskDefKey", task_def_key_);
         map.put("taskId",list.get(0).getId_());
+        taskService.setVariablesLocal(list.get(0).getId_(),bv.getFormVariables());
         return new ResultBean().success().setData(map);
     }
 

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

@@ -18,7 +18,6 @@ import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.flowable.bpmn.model.ExtensionAttribute;
 import org.flowable.bpmn.model.FlowElement;
 import org.flowable.engine.HistoryService;
 import org.flowable.engine.RepositoryService;
@@ -35,6 +34,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 
@@ -84,11 +84,16 @@ public class FlowTaskController implements FlowTaskFeign {
     }
 
     @Override
-    public ResultBean<Page<FlowTaskDto>> businessTodoList(String userSid, PagerQuery<BusinessTaskQuery> businessTaskQuery) {
+    public ResultBean<Page<FlowTaskDto>> businessTodoList(String userSid,  PagerQuery<BusinessTaskQuery> businessTaskQuery) {
         int size = Integer.valueOf(businessTaskQuery.getSize() + "");
         int current = Integer.valueOf(businessTaskQuery.getCurrent() + "");
         List<BusinessTaskParam> fields = businessTaskQuery.getParams().getFields();
-        ResultBean<Page<FlowTaskDto>> resultBean = flowTaskService.businessTodoList(userSid, fields, current, size);
+        AtomicReference<String> orgPath= new AtomicReference<>("");
+        fields.forEach(f->{
+            if(f.getField().equals(BusinessVariables.ORGPATH))
+                orgPath.set(f.getValue());
+        });
+        ResultBean<Page<FlowTaskDto>> resultBean = flowTaskService.businessTodoList(userSid, orgPath.get(), fields, current, size);
         return resultBean;
     }
 
@@ -97,13 +102,19 @@ public class FlowTaskController implements FlowTaskFeign {
         int size = Integer.valueOf(businessTaskQuery.getSize() + "");
         int current = Integer.valueOf(businessTaskQuery.getCurrent() + "");
         List<BusinessTaskParam> fields = businessTaskQuery.getParams().getFields();
-        ResultBean<Page<FlowTaskDto>> resultBean = flowTaskService.businessTodoListForApp(userSid, fields, current, size);
+        String companySid="";
+        ResultBean<Page<FlowTaskDto>> resultBean = flowTaskService.businessTodoListForApp(userSid,companySid, fields, current, size);
         return resultBean;
     }
 
     @Override
     public ResultBean<Integer> getTodoNum(String userSid) {
-        return flowTaskService.getTodoNum(userSid);
+        return flowTaskService.getTodoNum(userSid,null);
+    }
+
+    @Override
+    public ResultBean<Integer> getTodoNum(String userSid, String orgPath) {
+        return flowTaskService.getTodoNum(userSid,orgPath);
     }
 
     @Override

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

@@ -114,6 +114,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
     @Resource
     private FlowableService flowableService;
     public ResultBean getProcessCirculationNodesByMap(BusinessVariables bv) {
+        log.info("bv");
         String modelId = null;
         if (bv.getModelId()!= null) {
             modelId = bv.getModelId();
@@ -405,7 +406,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
      * @param pageSize 每页条数
      * @return
      */
-    public ResultBean<Page<FlowTaskDto>> businessTodoList(String userSid, List<BusinessTaskParam> params, Integer pageNum,
+    public ResultBean<Page<FlowTaskDto>> businessTodoList(String userSid,String orgPath, List<BusinessTaskParam> params, Integer pageNum,
                                                           Integer pageSize) {
 
         Page<FlowTaskDto> page = new Page<>();
@@ -446,14 +447,14 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
      /*   if (CollectionUtils.isEmpty(roleSidList)) {
             return new ResultBean().fail().setMsg("请先设置用户角色");
         }*/
-        taskQuery.active()
+        TaskQuery or = taskQuery.active()
                 .includeProcessVariables()
-                .includeTaskLocalVariables()
-                .or()
-                //.taskVariableValueEquals("orgSidPath","111222333")
+                .includeTaskLocalVariables();
+                if(StringUtils.isNotBlank(orgPath)){
+                    or.taskVariableValueEquals("orgPath", orgPath);
+                }
                 //.taskCandidateGroupIn(roleSidList)
-                .taskAssigneeLike("%" + userSid + "%")
-                .endOr()
+                or.taskAssigneeLike("%" + userSid + "%")
                 .orderByTaskCreateTime().desc();
         // 查询筛选条件
         if (paramMap.get("startDate") != null && StringUtils.isNotBlank(paramMap.get("startDate").toString())) {
@@ -532,8 +533,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
      * @param userSid
      * @return
      */
-    public ResultBean<Integer> getTodoNum(String userSid) {
-        long num = taskService.createTaskQuery().taskAssigneeLike("%"+userSid+"%").count();
+    public ResultBean<Integer> getTodoNum(String userSid,String orgPath) {
+
+        long num = taskService.createTaskQuery().taskAssigneeLike("%"+userSid+"%").taskVariableValueEquals("orgPath", orgPath).count();
         return new ResultBean<Integer>().success().setData(Integer.parseInt(String.valueOf(num)));
     }
 
@@ -1715,7 +1717,8 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         int size = Integer.valueOf(businessTaskQuery.getSize() + "");
         int current = Integer.valueOf(businessTaskQuery.getCurrent() + "");
         List<BusinessTaskParam> fields = businessTaskQuery.getParams().getFields();
-        ResultBean<Page<FlowTaskDto>> resultBean = businessTodoList(userSid, fields, current, size);
+        String companySid="";
+        ResultBean<Page<FlowTaskDto>> resultBean = businessTodoList(userSid,companySid, fields, current, size);
         return resultBean;
     }
 
@@ -1836,7 +1839,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         return rb.setData(list);
     }
 
-    public ResultBean<Page<FlowTaskDto>> businessTodoListForApp(String userSid, List<BusinessTaskParam> params, int pageNum, int pageSize) {
+    public ResultBean<Page<FlowTaskDto>> businessTodoListForApp(String userSid,String companySid, List<BusinessTaskParam> params, int pageNum, int pageSize) {
         Page<FlowTaskDto> page = new Page<>();
         TaskQuery taskQuery = taskService.createTaskQuery();
         // 流程参数

anrui-gateway/src/main/resources/application-devv.yml

@@ -4,16 +4,16 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 39.104.100.138:8848
+        server-addr: 127.0.0.1:8848
   redis:
     database: 3  # Redis数据库索引（默认为0）
-    host: 39.104.100.138
+    host: 127.0.0.1
     jedis:
       pool:
         max-active: -1  #连接池最大连接数（使用负值表示没有限制）
         max-idle: 8  #连接池中的最大空闲连接
         max-wait: -1   # 连接池最大阻塞等待时间（使用负值表示没有限制）
         min-idle: 0  # 连接池中的最小空闲连接
-    password:
+    password: 123456
     port: 6379
     timeout: 0  # 连接超时时间(毫秒)

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFallback.java

@@ -85,6 +85,11 @@ public class FlowableFallback implements FlowableFeign{
         return null;
     }
 
+    @Override
+    public ResultBean<Integer> getTodoNum(String userSid, String orgPath) {
+        return null;
+    }
+
     @Override
     public ResultBean<Page<FlowTaskDto>> doneAllTaskList(String userSid, PagerQuery<FlowTaskAllQuery> pQuery) {
         return null;

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFeign.java

@@ -175,11 +175,16 @@ public interface FlowableFeign {
      */
     @ApiOperation(value = "总待办列表")
     @PostMapping("/todoAllTaskList/{userSid}")
-    public ResultBean<Page<FlowTaskDto>> todoAllTaskList(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid, @ApiParam(value = "变量集合,json对象") @RequestBody PagerQuery<FlowTaskAllQuery> pQuery);
+    public ResultBean<Page<FlowTaskDto>> todoAllTaskList(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid,
+                                                         @ApiParam(value = "变量集合,json对象") @RequestBody PagerQuery<FlowTaskAllQuery> pQuery);
 
     @ApiOperation(value = "业务系统查询待办任务列表数量")
     @GetMapping("/getTodoNum/{userSid}")
     ResultBean<Integer> getTodoNum(@PathVariable(value = "userSid") String userSid);
+    @ApiOperation(value = "业务系统查询待办任务列表数量")
+    @GetMapping("/getTodoNum/{userSid}/{orgPath}")
+    ResultBean<Integer> getTodoNum(@PathVariable(value = "userSid")String userSid,
+                                   @PathVariable(value = "orgPath") String orgPath);
 
     /**
      * 已办任务的查询

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java

@@ -38,7 +38,7 @@ public interface AppSysUserFeign {
 
     @ApiOperation(value = "我的信息")
     @ResponseBody
-//    @GetMapping("/getMyInfo/{userSid}")
+    @GetMapping("/getMyInfo/{userSid}")
     public ResultBean getMyInfo(@PathVariable("userSid") String userSid);
 
     @ApiOperation(value = "我的信息:切换机构")

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

@@ -183,6 +183,17 @@ public class FlowableRest implements FlowableFeign {
         }
         return flowableService.getTodoNum(userSid);
     }
+    @Override
+    public ResultBean<Integer> getTodoNum(String userSid,String orgPath) {
+        ResultBean<Integer> rb=ResultBean.fireFail();
+        if(StringUtils.isBlank(userSid)){
+            return rb.setMsg("用户sid不能为空");
+        }
+        if(StringUtils.isBlank(orgPath)){
+            return rb.setMsg("用户orgPath不能为空");
+        }
+        return flowableService.getTodoNum(userSid,orgPath);
+    }
 
     @Override
     public ResultBean<Page<FlowTaskDto>> doneAllTaskList(String userSid, PagerQuery<FlowTaskAllQuery> pQuery) {//已办列表

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

@@ -175,7 +175,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         }
         if (StringUtils.isNotBlank(orgSid)) {
             BusinessTaskParam taskParam = new BusinessTaskParam();
-            taskParam.setField("orgSid");
+            taskParam.setField(BusinessVariables.ORGPATH);
             taskParam.setSqlOperationSymbol(SQLOperationSymbol.NONE);
             taskParam.setValue(orgSid);
             taskParamList.add(taskParam);
@@ -223,40 +223,6 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         return flowTaskFeign.businessDoneList(userSid, taskQueryPagerQuery);
     }
 
-    /**
-     * 办理
-     *
-     * @param variables
-     * @return
-     */
-   /* public ResultBean complete(Map<String, Object> variables) {
-        BusinessVariables bv = BusinessVariables.builder().build();
-        bv.setFormVariables(variables);
-        ResultBean<com.yxt.anrui.flowable.api.flowtask.FlowTask> resultBean = flowTaskFeign.businessComplete(bv);
-        if (!resultBean.getSuccess()) {
-            return resultBean;
-        }
-        String nodeState = "";
-        String taskDefKey = "";
-        Map<String, Object> map = new HashMap<>();
-        map.put("businessSid", variables.get("businessSid").toString());
-        if (resultBean.getData() != null) {
-            ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(resultBean.getData().getProcInsId());
-            if (listResultBean.getSuccess() && listResultBean.getData() != null && listResultBean.getData().size() != 0) {
-                nodeState = listResultBean.getData().get(0).getName_();
-                taskDefKey = listResultBean.getData().get(0).getTask_def_key_();
-            } else {
-                nodeState = FlowComment.SETTLE.getRemark();
-                taskDefKey = "Event_end";
-                map.put("flowState", FlowComment.SETTLE.getRemark());
-            }
-        }
-        map.put("nodeState", nodeState);
-        map.put("taskDefKey", taskDefKey);
-        sysFormLinkFeign.updateFiled(map);
-        return new ResultBean().success();
-    }*/
-
     /**
      * 撤回
      *
@@ -334,7 +300,6 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
     /**
      * 终止流程
      *
-     * @param businessSid
      * @param flowTaskVo
      * @return
      */
@@ -373,7 +338,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         PagerQuery<BusinessTaskQuery> taskQueryPagerQuery = new PagerQuery<>();
         taskQueryPagerQuery.setCurrent(pQuery.getCurrent()).setSize(pQuery.getSize());
 
-
+        String orgSid = params.getOrgSid();
         String processDefinitionId = params.getProcessDefinitionId();
         String proDefName = params.getProDefName();
         String startDate = params.getStartDate();
@@ -408,6 +373,13 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             taskParam.setValue(processDefinitionId);
             taskParamList.add(taskParam);
         }
+       // if (StringUtils.isNotBlank(orgSid)) {
+            BusinessTaskParam taskParam = new BusinessTaskParam();
+            taskParam.setField(BusinessVariables.ORGPATH);
+            taskParam.setSqlOperationSymbol(SQLOperationSymbol.NONE);
+            taskParam.setValue("123456789");//orgSid);
+            taskParamList.add(taskParam);
+      //  }
         taskQuery.setFields(taskParamList);
         taskQueryPagerQuery.setParams(taskQuery);
         return flowTaskFeign.businessTodoList(userSid, taskQueryPagerQuery);
@@ -416,6 +388,9 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
     public ResultBean<Integer> getTodoNum(String userSid) {
         return flowTaskFeign.getTodoNum(userSid);
     }
+    public ResultBean<Integer> getTodoNum(String userSid,String orgPath) {
+        return flowTaskFeign.getTodoNum(userSid,orgPath);
+    }
 
     public ResultBean getNextTasks(String taskId) {
         return flowTaskFeign.getNextTasks(taskId);

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/config/Swagger2Config.java

@@ -20,7 +20,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableSwagger2
 @EnableKnife4j
 public class Swagger2Config {
-
     @Bean
     public Docket createRestApi() {
         return new Docket(DocumentationType.SWAGGER_2)

anrui-scm/anrui-scm-ui/.env.development

@@ -6,6 +6,6 @@ VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
 ##VUE_APP_URL = "http://26077a35f5.wicp.vip"
-VUE_APP_URL = "http://anrui.yyundong.com"
+VUE_APP_URL = "http://127.0.0.1:8111"
 ##VUE_APP_URL = "http://120.46.172.184:8111"
 ##VUE_APP_URL = "http://1mn7264414.qicp.vip"

anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js

@@ -504,13 +504,13 @@ const codemenu = [
         component: () => import('@/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue'),
         name: 'specialrebatetobechecked',
         meta: { title: '专项返利核对', noCache: true }
-      },
+      }/*,
       {
         path: '/specialrebate/specialrebatedistribution',
         component: () => import('@/views/specialrebate/specialrebatedistribution/specialrebatetobeallocated.vue'),
         name: 'specialrebatetobeallocated',
         meta: { title: '专项返利分配', noCache: true }
-      }
+      }*/
     ]
   },
   // 入库管理

anrui-system-ui/.env.development

@@ -6,5 +6,5 @@ VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
 ##VUE_APP_URL = "http://26077a35f5.wicp.vip"
-VUE_APP_URL = "http://anrui.yyundong.com"
+VUE_APP_URL = "http://127.0.0.1:8111"
 ##VUE_APP_URL = "http://1mn7264414.qicp.vip"