|
|
@@ -250,16 +250,20 @@ public class OrganizationManagerServiceImpl extends SuperService {
|
|
|
|
|
|
public OidAboutInfo getOidAboutInfo(String oid) {
|
|
|
OidAboutInfo aboutInfo = new OidAboutInfo();
|
|
|
- Organization organization = organizationDao.findTopByOid(oid);
|
|
|
- if (ObjectUtils.isNotEmpty(organization)) {
|
|
|
- aboutInfo.setOid(oid);
|
|
|
- aboutInfo.setAuthType(organization.getAuthType());
|
|
|
-
|
|
|
- AuthType authType = organization.getAuthType();
|
|
|
- if (authType == AuthType.Project) {
|
|
|
- aboutInfo.setProjectOid(oid);
|
|
|
+ if (StringUtils.isNotEmpty(oid)) {
|
|
|
+ Organization organization = organizationDao.findTopByOid(oid);
|
|
|
+ if (ObjectUtils.isNotEmpty(organization)) {
|
|
|
+ aboutInfo.setOid(oid);
|
|
|
+ aboutInfo.setAuthType(organization.getAuthType());
|
|
|
+
|
|
|
+ AuthType authType = organization.getAuthType();
|
|
|
+ if (authType == AuthType.Project) {
|
|
|
+ aboutInfo.setProjectOid(oid);
|
|
|
+ }
|
|
|
+
|
|
|
+ } else {
|
|
|
+ aboutInfo.setOid(oid);
|
|
|
}
|
|
|
-
|
|
|
} else {
|
|
|
aboutInfo.setOid(oid);
|
|
|
}
|