diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/product/ProductProperties.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/product/ProductProperties.java index 204598104..6fd39280e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/product/ProductProperties.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/product/ProductProperties.java @@ -18,4 +18,8 @@ public class ProductProperties { */ private Long imesProduct; + /** + * imes生产系统组织套餐 + */ + private Long imesTenantPackage; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java index 8e98e0886..8af64c599 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java @@ -58,6 +58,7 @@ import com.cf.imes.module.system.dal.mysql.systemconfig.*; import com.cf.imes.module.system.dal.mysql.tokenconfig.TokenConfigMapper; import com.cf.imes.module.system.enums.config.SystemConfigTypeEnum; import com.cf.imes.module.system.enums.permission.RoleCodeEnum; +import com.cf.imes.module.system.framework.product.ProductProperties; import com.cf.imes.module.system.service.funds.purchase.PurchaseService; import com.cf.imes.module.system.service.organ.handler.OrganInfoHandler; import com.cf.imes.module.system.service.organ.handler.OrganMenuHandler; @@ -172,6 +173,9 @@ public class OrganServiceImpl implements OrganService { @Resource private CustomPlateNoSeqMapper customPlateNoSeqMapper; + @Resource + private ProductProperties productProperties; + @Override public List getOrganIdList() { List organizationDOS = organMapper.selectList(); @@ -545,7 +549,7 @@ public class OrganServiceImpl implements OrganService { if (isSystemTenant(tenant) || (SecurityFrameworkUtils.isCfOrg() && SecurityFrameworkUtils.isManageEndPoint())) { // 系统组织,菜单是全量的 menuIds = CollectionUtils.convertSet(menuService.getMenuList(), MenuDO::getId); } else { - menuIds = tenantPackageService.getTenantPackage(tenant.getPackageId()).getMenuIds(); + menuIds = tenantPackageService.getTenantPackage(productProperties.getImesTenantPackage()).getMenuIds(); } // 执行处理器 handler.handle(menuIds); diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/application-local.yaml b/cf-module-system/cf-module-system-biz/src/main/resources/application-local.yaml index 6cc27883b..a7f801f9d 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/application-local.yaml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/application-local.yaml @@ -323,6 +323,7 @@ chenfeng: notifyUrl: RIEeHCoPHaAryuVN6mEYskBSl+EPvhsxRpjIbuIE7f7jABVxm46bLc01WQUe4Fn9NPYyNTv0xCxM68iRrmFDjAUjQ/hkIVNG+yD/kNsjcYCWa2gtOQPrvWZzDA== product-id: imes-product: 4 + imes-tenant-package: 514 justauth: enabled: true