WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

禅道 55588问题修改 - 任务清单数据权限。

Browse Source
This commit is contained in:
wangzhijiang
2022-07-07 16:59:49 +08:00
parent 42d033f4ff
commit cf304b6a5f
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+17 -4
View File
@@ -481,8 +481,14 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
* studio：查询所有（已启动流程的数据） ， 包含自己待办、已办 * studio：查询所有（已启动流程的数据） ， 包含自己待办、已办
* 法规工程师 / 认证工程师： 查询跟自己有关系的数据 ， 包含自己待办、已办 * 法规工程师 / 认证工程师： 查询跟自己有关系的数据 ， 包含自己待办、已办
* 其他人：查询自己待办、已办数据。 * 其他人：查询自己待办、已办数据。
*/
if(isStudio || (isRegulationOwner || isHomologationEngineer)){ if(isStudio || (isRegulationOwner || isHomologationEngineer)){
*/
/**
* 2022-07-07修改禅道 55588问题。 只有studio可以查看所有已经启动了的流程
* studio：查询所有（已启动流程的数据） ， 包含自己待办、已办
*/
if(isStudio){
actiProcInstId = projectTaskInventoryDetailEO.getActiProcInstId(); actiProcInstId = projectTaskInventoryDetailEO.getActiProcInstId();
if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){ if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){
designPid = actiProcInstId; designPid = actiProcInstId;
@@ -570,8 +576,14 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
projectTaskInventoryEO.setCertificationProgress(projectTaskInventoryEO.getCertificationProgress()); projectTaskInventoryEO.setCertificationProgress(projectTaskInventoryEO.getCertificationProgress());
projectTaskInventoryEO.setCertificationProgressRemark(projectTaskInventoryEO.getCertificationProgressRemark()); projectTaskInventoryEO.setCertificationProgressRemark(projectTaskInventoryEO.getCertificationProgressRemark());
}else { }else {
projectTaskInventoryEO.setCertificationProgress(""); if((isRegulationOwner || isHomologationEngineer)){
projectTaskInventoryEO.setCertificationProgressRemark(""); projectTaskInventoryEO.setCertificationProgress(projectTaskInventoryEO.getCertificationProgress());
projectTaskInventoryEO.setCertificationProgressRemark(projectTaskInventoryEO.getCertificationProgressRemark());
}else {
projectTaskInventoryEO.setCertificationProgress("");
projectTaskInventoryEO.setCertificationProgressRemark("");
}
if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){ if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
actiProcInstId = projectTaskInventoryDetailEO.getActiProcInstId(); actiProcInstId = projectTaskInventoryDetailEO.getActiProcInstId();
if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){ if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){
@@ -599,7 +611,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
} }
} }
if(StringUtils.isNotEmpty(actiProcInstId) && (isRegulationOwner || isHomologationEngineer || isStudio)){ /*if(StringUtils.isNotEmpty(actiProcInstId) && (isRegulationOwner || isHomologationEngineer || isStudio)){*/
if(StringUtils.isNotEmpty(actiProcInstId) && (isStudio)){
projectTaskInventoryEO.setShowFlag(TaskStatusEnum.SHOW_FLAG.getValue()); projectTaskInventoryEO.setShowFlag(TaskStatusEnum.SHOW_FLAG.getValue());
} }