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 edfc8786..c1d76380 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 @@ -166,6 +166,7 @@ public class FlowBusinessKeyController extends BaseController { @GetMapping(value = "/myAwaitFlowTaskList") public TableDataInfo myAwaitFlowTaskList(FlowTaskEntity flowTaskEntity) { LoginUser loginUser = SecurityUtils.getLoginUser(); + Long projectId=loginUser.getSysUser().getActiveProjectId(); if(StringUtils.isNotEmpty(flowTaskEntity.getStartProId())){ // 小程序查询会走这里 flowTaskEntity.setAssigneeId(SecurityUtils.getUserId()); @@ -179,21 +180,21 @@ public class FlowBusinessKeyController extends BaseController { }else{ if(SecurityUtils.isAdmin(loginUser.getUserid())){ // 超管查询所有申请... - if(Objects.nonNull(loginUser.getProjectDeptId())){ - flowTaskEntity.setStartComId(Convert.toStr(loginUser.getProjectDeptId())); + if(Objects.nonNull(projectId)){ + flowTaskEntity.setStartComId(Convert.toStr(projectId)); } - if(Objects.nonNull(loginUser.getProjectId())){ - flowTaskEntity.setStartProId(Convert.toStr(loginUser.getProjectId())); + if(Objects.nonNull(projectId)){ + flowTaskEntity.setStartProId(Convert.toStr(projectId)); } }else if(SecurityUtils.isGSAdmin()){ // 公司管理员查询公司内的所有申请... flowTaskEntity.setStartComId(Convert.toStr(loginUser.getProjectDeptId())); - if(Objects.nonNull(loginUser.getProjectId())){ - flowTaskEntity.setStartProId(Convert.toStr(loginUser.getProjectId())); + if(Objects.nonNull(projectId)){ + flowTaskEntity.setStartProId(Convert.toStr(projectId)); } }else if(SecurityUtils.isXMAdmin()){ // 公司管理员查询公司内的所有申请... - flowTaskEntity.setStartProId(Convert.toStr(loginUser.getProjectId())); + flowTaskEntity.setStartProId(Convert.toStr(projectId)); }else{ flowTaskEntity.setAssigneeId(SecurityUtils.getUserId()); if(loginUser.getSysUser().getRoles().size()>0){ @@ -218,6 +219,9 @@ public class FlowBusinessKeyController extends BaseController { public TableDataInfo myFinishedFlowTaskList(FlowTaskEntity flowTaskEntity) { startPage(); flowTaskEntity.setAssigneeId(SecurityUtils.getUserId()); + LoginUser loginUser = SecurityUtils.getLoginUser(); + Long projectId=loginUser.getSysUser().getActiveProjectId(); + flowTaskEntity.setStartProId(Convert.toStr(projectId)); return getDataTable(flowBusinessKeyService.selectMyFinishedFlowTask(flowTaskEntity)); } diff --git a/yanzhu-modules/yanzhu-flowable/src/main/resources/logback.xml b/yanzhu-modules/yanzhu-flowable/src/main/resources/logback.xml index ed048b14..a6429935 100644 --- a/yanzhu-modules/yanzhu-flowable/src/main/resources/logback.xml +++ b/yanzhu-modules/yanzhu-flowable/src/main/resources/logback.xml @@ -58,7 +58,7 @@ - +