|
|
|
@ -699,7 +699,11 @@ public class CommonServiceUtils {
|
|
|
|
|
public static String evaluateOrganization(String organization, Sources sourceInPath) {
|
|
|
|
|
if(sourceInPath.equals(Sources.GRSF) &&
|
|
|
|
|
(organization.compareTo(Constants.GRSF_ADMIN_ORGANIZATION_NAME)==0 || organization.compareTo(Constants.GRSF_PRE_ORGANIZATION_NAME)==0)){
|
|
|
|
|
return Constants.GRSF_ADMIN_ORGANIZATION_NAME;
|
|
|
|
|
if(organization.compareTo(Constants.GRSF_ADMIN_ORGANIZATION_NAME)==0) {
|
|
|
|
|
return Constants.GRSF_ADMIN_ORGANIZATION_NAME;
|
|
|
|
|
}else {
|
|
|
|
|
return Constants.GRSF_PRE_ORGANIZATION_NAME;
|
|
|
|
|
}
|
|
|
|
|
}else
|
|
|
|
|
return sourceInPath.getOrigName().toLowerCase();
|
|
|
|
|
}
|
|
|
|
|