jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: jiangyq:9c659fe2023bb9cef2285244fb50cae654022759
Branches Tags
jiangyq:dev_xd
jiangyq:main
..
compare: jiangyq:87b29c8e991e369289cb44e61f335aab21513e39
Branches Tags
jiangyq:dev_xd
jiangyq:main

No commits in common. "9c659fe2023bb9cef2285244fb50cae654022759" and "87b29c8e991e369289cb44e61f335aab21513e39" have entirely different histories.
9c659fe202 ... 87b29c8e99

1 changed files with 7 additions and 13 deletions
Show Stats Expand all files Collapse all files

20
yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java
View File

@ -62,24 +62,22 @@ public class FlowBusinessKeyController extends BaseController {
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
if(SecurityUtils.isAdmin(loginUser.getUserid())){ if(SecurityUtils.isAdmin(loginUser.getUserid())){
// TODO：超管查询所有申请... // TODO：超管查询所有申请...
/** if(Objects.nonNull(loginUser.getProjectDeptId())){ if(Objects.nonNull(loginUser.getProjectDeptId())){
flowTaskEntity.setStartComId(Convert.toStr(loginUser.getProjectDeptId())); flowTaskEntity.setStartComId(Convert.toStr(loginUser.getProjectDeptId()));
}
if(Objects.nonNull(loginUser.getProjectId())){
flowTaskEntity.setStartProId(Convert.toStr(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()){ }else if(SecurityUtils.isGSAdmin()){
// 公司管理员查询公司内的所有申请... // 公司管理员查询公司内的所有申请...
// flowTaskEntity.setStartComId(Convert.toStr(loginUser.getProjectDeptId())); flowTaskEntity.setStartComId(Convert.toStr(loginUser.getProjectDeptId()));
if(Objects.nonNull(loginUser.getSysUser().getActiveProjectId())){ if(Objects.nonNull(loginUser.getProjectId())){
flowTaskEntity.setStartProId(Convert.toStr(loginUser.getSysUser().getActiveProjectId())); flowTaskEntity.setStartProId(Convert.toStr(loginUser.getProjectId()));
} }
}else if(SecurityUtils.isXMAdmin()){ }else if(SecurityUtils.isXMAdmin()){
// 公司管理员查询公司内的所有申请... // 公司管理员查询公司内的所有申请...
flowTaskEntity.setStartProId(Convert.toStr(loginUser.getSysUser().getActiveProjectId())); flowTaskEntity.setStartProId(Convert.toStr(loginUser.getProjectId()));
}else{ }else{
flowTaskEntity.setStartProId(Convert.toStr(loginUser.getSysUser().getActiveProjectId()));
flowTaskEntity.setStartUserId(Convert.toStr(loginUser.getUserid())); flowTaskEntity.setStartUserId(Convert.toStr(loginUser.getUserid()));
} }
startPage(); startPage();
@ -121,10 +119,6 @@ public class FlowBusinessKeyController extends BaseController {
roleIds.add(0L); roleIds.add(0L);
flowTaskEntity.setRoleIds(roleIds); 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)); return success(flowBusinessKeyService.quueryCount(flowTaskEntity));
} }