Merge branch 'dev_bugfix' into dev

5 years ago · 6933f972ba
2 changed files with 2 additions and 2 deletions
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
@ -253,7 +253,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
            agencyDeptGrid.getAgencyList().forEach(agency->{
                if (ts.getAgencyId().equals(agency.getId())) {
                    entity.setCustomerId(agency.getCustomerId());
-                    entity.setOrgIdPath(agency.getPids()+":"+agency.getId());
+                    entity.setOrgIdPath(("".equals(agency.getPids()) ? "" : agency.getPids() + ":") + agency.getId());
                    entity.setDepartmentName(agency.getOrganizationName());
                }
            });
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@ -579,7 +579,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			agencyDeptGrid.getAgencyList().forEach(agency -> {
 				if (ts.getAgencyId().equals(agency.getId())) {
 					entity.setCustomerId(agency.getCustomerId());
-					entity.setOrgIdPath(agency.getPids() + ":" + agency.getId());
+					entity.setOrgIdPath(("".equals(agency.getPids()) ? "" : agency.getPids() + ":") + agency.getId());
 					entity.setDepartmentName(agency.getOrganizationName());
 				}
 			});