zcy
/
iotkit-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-V0.4.5' into dev-V0.4.5-postgre

V0.5.x
jay 2023-08-08 15:59:28 +08:00
parent 47e808e9f4 dc67b35d74
commit eb95cc946b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantServiceImpl.java
View File

@ -44,7 +44,9 @@ public class SysTenantServiceImpl implements ISysTenantService {
@Cacheable(cacheNames = CacheNames.SYS_TENANT, key = "#tenantId")
@Override
public SysTenantVo queryByTenantId(String tenantId) {
SysTenant tenant = sysTenantData.findById(Long.valueOf(tenantId));
SysTenant sysTenant = new SysTenant();
sysTenant.setTenantId(tenantId);
SysTenant tenant = sysTenantData.findOneByCondition(sysTenant);
return MapstructUtils.convert(tenant,SysTenantVo.class);
}
@ -97,7 +99,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
@Override
public boolean checkAccountBalance(String tenantId) {
SysTenantVo tenant = SpringUtils.getAopProxy(this).queryByTenantId(tenantId);
SysTenantVo tenant = this.queryByTenantId(tenantId);
// 如果余额为-1代表不限制
if (tenant.getAccountCount() == -1) {
return true;