mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-14 21:52:07 +08:00
移除组织校验中的组织套餐校验
This commit is contained in:
-10
@@ -38,7 +38,6 @@ import com.cf.imes.module.system.dal.dataobject.machine.MachineDO;
|
|||||||
import com.cf.imes.module.system.dal.dataobject.machine.MachineLimitDO;
|
import com.cf.imes.module.system.dal.dataobject.machine.MachineLimitDO;
|
||||||
import com.cf.imes.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO;
|
import com.cf.imes.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO;
|
||||||
import com.cf.imes.module.system.dal.dataobject.organ.OrganizationDO;
|
import com.cf.imes.module.system.dal.dataobject.organ.OrganizationDO;
|
||||||
import com.cf.imes.module.system.dal.dataobject.organ.TenantPackageDO;
|
|
||||||
import com.cf.imes.module.system.dal.dataobject.permission.MenuDO;
|
import com.cf.imes.module.system.dal.dataobject.permission.MenuDO;
|
||||||
import com.cf.imes.module.system.dal.dataobject.permission.RoleDO;
|
import com.cf.imes.module.system.dal.dataobject.permission.RoleDO;
|
||||||
import com.cf.imes.module.system.dal.dataobject.systemconfig.*;
|
import com.cf.imes.module.system.dal.dataobject.systemconfig.*;
|
||||||
@@ -178,15 +177,6 @@ public class OrganServiceImpl implements OrganService {
|
|||||||
if (DateUtils.isExpired(organizationDO.getExpireTime())) {
|
if (DateUtils.isExpired(organizationDO.getExpireTime())) {
|
||||||
throw exception(ORGAN_EXPIRE, organizationDO.getName());
|
throw exception(ORGAN_EXPIRE, organizationDO.getName());
|
||||||
}
|
}
|
||||||
if (ObjectUtil.isNull(organizationDO.getPackageId())) {
|
|
||||||
throw exception(TENANT_PACKAGE_NOT_EXISTS);
|
|
||||||
}
|
|
||||||
// 组织套餐相关校验
|
|
||||||
Long packageId = organizationDO.getPackageId();
|
|
||||||
if (ObjectUtil.isNull(packageId)) {
|
|
||||||
throw exception(TENANT_PACKAGE_NOT_EXISTS);
|
|
||||||
}
|
|
||||||
tenantPackageService.validTenantPackage(packageId);
|
|
||||||
return organizationDO;
|
return organizationDO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user