admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 修正 SysTenantServiceImpl#deleteWithValidByIds 超管租户可以被删除的问题, 加上 id 校验 ;

Browse Source 
fix 修正 tenant/index.vue handleUpdate 租户套餐回显问题 ;
This commit is contained in:
zlyx 2023-02-17 16:02:04 +08:00
parent fcea03a975
commit e7242d4011
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java
View File

@ -278,6 +278,9 @@ public class SysTenantServiceImpl implements ISysTenantService {
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) { public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if (isValid) { if (isValid) {
// 做一些业务上的校验,判断是否需要校验 // 做一些业务上的校验,判断是否需要校验
if (ids.contains(TenantConstants.SUPER_ADMIN_ID)) {
throw new ServiceException("超管租户不能删除");
}
} }
return baseMapper.deleteBatchIds(ids) > 0; return baseMapper.deleteBatchIds(ids) > 0;
} }

1
ruoyi-ui/src/views/system/tenant/index.vue
View File

@ -360,6 +360,7 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.loading = true; this.loading = true;
this.reset(); this.reset();
this.getTenantPackage();
const id = row.id || this.ids const id = row.id || this.ids
getTenant(id).then(response => { getTenant(id).then(response => {
this.loading = false; this.loading = false;