TRX 1 سال پیش
والد
کامیت
8e090ba0df

+ 13 - 9
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/orgManager/OrganizationManagerServiceImpl.java

@@ -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);
         }

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/CardInfoServiceImpl.java

@@ -86,7 +86,8 @@ public class CardInfoServiceImpl extends SuperService implements CardInfoService
      */
     @Override
     public ResultContent addCardInfo(CardInfoParam param) {
-        checkParamOid(param);
+//        checkParamOid(param);
+
         initDefaultUserParam(param);
         if (StringUtils.isEmpty(param.getCode())) {
             return ResultContent.buildFail("code不能为空");