From cf304b6a5f5758e17e65207f4710f7e691409212 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 7 Jul 2022 16:59:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93=2055588=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20-=20=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectTaskInventoryEOServiceImpl.java    | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
index bf51907cd..131545867 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
@@ -481,8 +481,14 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 					 * studio：查询所有（已启动流程的数据） ， 包含自己待办、已办
 					 * 法规工程师 / 认证工程师： 查询跟自己有关系的数据 ， 包含自己待办、已办
 					 * 其他人：查询自己待办、已办数据。
-					 */
+
 					if(isStudio || (isRegulationOwner || isHomologationEngineer)){
+					 */
+					/**
+					 * 2022-07-07修改禅道 55588问题。 只有studio可以查看所有已经启动了的流程
+					 * studio：查询所有（已启动流程的数据） ， 包含自己待办、已办
+					 */
+					if(isStudio){
 						actiProcInstId = projectTaskInventoryDetailEO.getActiProcInstId();
 						if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){
 							designPid = actiProcInstId;
@@ -570,8 +576,14 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 						projectTaskInventoryEO.setCertificationProgress(projectTaskInventoryEO.getCertificationProgress());
 						projectTaskInventoryEO.setCertificationProgressRemark(projectTaskInventoryEO.getCertificationProgressRemark());
 					}else {
-						projectTaskInventoryEO.setCertificationProgress("");
-						projectTaskInventoryEO.setCertificationProgressRemark("");
+						if((isRegulationOwner || isHomologationEngineer)){
+							projectTaskInventoryEO.setCertificationProgress(projectTaskInventoryEO.getCertificationProgress());
+							projectTaskInventoryEO.setCertificationProgressRemark(projectTaskInventoryEO.getCertificationProgressRemark());
+						}else {
+							projectTaskInventoryEO.setCertificationProgress("");
+							projectTaskInventoryEO.setCertificationProgressRemark("");
+						}
+
 						if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
 							actiProcInstId = projectTaskInventoryDetailEO.getActiProcInstId();
 							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());
 			}