diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java index 93f0799f..edfc8786 100644 --- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java @@ -62,22 +62,24 @@ public class FlowBusinessKeyController extends BaseController { LoginUser loginUser = SecurityUtils.getLoginUser(); if(SecurityUtils.isAdmin(loginUser.getUserid())){ // TODO:超管查询所有申请... - if(Objects.nonNull(loginUser.getProjectDeptId())){ + /** if(Objects.nonNull(loginUser.getProjectDeptId())){ flowTaskEntity.setStartComId(Convert.toStr(loginUser.getProjectDeptId())); - } - if(Objects.nonNull(loginUser.getProjectId())){ flowTaskEntity.setStartProId(Convert.toStr(loginUser.getProjectId())); + }*/ + if(Objects.nonNull(loginUser.getSysUser().getActiveProjectId())){ + flowTaskEntity.setStartProId(Convert.toStr(loginUser.getSysUser().getActiveProjectId())); } }else if(SecurityUtils.isGSAdmin()){ // 公司管理员查询公司内的所有申请... - flowTaskEntity.setStartComId(Convert.toStr(loginUser.getProjectDeptId())); - if(Objects.nonNull(loginUser.getProjectId())){ - flowTaskEntity.setStartProId(Convert.toStr(loginUser.getProjectId())); + // flowTaskEntity.setStartComId(Convert.toStr(loginUser.getProjectDeptId())); + if(Objects.nonNull(loginUser.getSysUser().getActiveProjectId())){ + flowTaskEntity.setStartProId(Convert.toStr(loginUser.getSysUser().getActiveProjectId())); } }else if(SecurityUtils.isXMAdmin()){ // 公司管理员查询公司内的所有申请... - flowTaskEntity.setStartProId(Convert.toStr(loginUser.getProjectId())); + flowTaskEntity.setStartProId(Convert.toStr(loginUser.getSysUser().getActiveProjectId())); }else{ + flowTaskEntity.setStartProId(Convert.toStr(loginUser.getSysUser().getActiveProjectId())); flowTaskEntity.setStartUserId(Convert.toStr(loginUser.getUserid())); } startPage(); @@ -119,6 +121,10 @@ public class FlowBusinessKeyController extends BaseController { roleIds.add(0L); flowTaskEntity.setRoleIds(roleIds); } + LoginUser loginUser = SecurityUtils.getLoginUser(); + if(Objects.nonNull(loginUser.getSysUser().getActiveProjectId())){ + flowTaskEntity.setStartProId(Convert.toStr(loginUser.getSysUser().getActiveProjectId())); + } return success(flowBusinessKeyService.quueryCount(flowTaskEntity)); }