|
@@ -85,14 +85,6 @@ public class OrgCloudServiceProvider extends ControllerSupport implements OrgClo
|
|
|
String orgCode = req.getOrgCode();
|
|
|
Long rootOrgId = req.getRootOrgId();
|
|
|
|
|
|
- if (null == orgId && StringUtils.isBlank(orgCode)) {
|
|
|
- throw new StatusException("B-150000", "orgId,orgCode不能都为空");
|
|
|
- }
|
|
|
-
|
|
|
- if (null != orgId && StringUtils.isNotBlank(orgCode)) {
|
|
|
- throw new StatusException("B-150001", "orgId,orgCode不能都不为空");
|
|
|
- }
|
|
|
-
|
|
|
OrgEntity org = null;
|
|
|
if (null != orgId) {
|
|
|
org = orgRepo.findOne(orgId);
|
|
@@ -101,6 +93,8 @@ public class OrgCloudServiceProvider extends ControllerSupport implements OrgClo
|
|
|
throw new StatusException("B-150001", "rootOrgId is null");
|
|
|
}
|
|
|
org = orgRepo.findByRootIdAndCode(rootOrgId, orgCode);
|
|
|
+ } else {
|
|
|
+ throw new StatusException("B-150001", "orgId,orgCode不能都不为空");
|
|
|
}
|
|
|
|
|
|
if (null == org) {
|