diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogPerson.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogPerson.java index 5bf673f..78fd021 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogPerson.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogPerson.java @@ -1,9 +1,10 @@ package org.dromara.system.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; import java.io.Serial; @@ -16,7 +17,7 @@ import java.io.Serial; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys_catalog_person") -public class SysCatalogPerson extends BaseEntity { +public class SysCatalogPerson extends TenantEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogPersonServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogPersonServiceImpl.java index 4177a9d..11460c9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogPersonServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogPersonServiceImpl.java @@ -10,6 +10,7 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.redis.utils.CacheUtils; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.domain.SysCatalogPerson; import org.dromara.system.domain.SysOssPerson; import org.dromara.system.domain.bo.SysCatalogPersonBo; @@ -44,7 +45,7 @@ public class SysCatalogPersonServiceImpl implements ISysCatalogPersonService { * @return 目录-我的空间 */ @Override - public SysCatalogPersonVo queryById(Long catalogId){ + public SysCatalogPersonVo queryById(Long catalogId) { return baseMapper.selectVoById(catalogId); } @@ -57,6 +58,7 @@ public class SysCatalogPersonServiceImpl implements ISysCatalogPersonService { */ @Override public List queryList(SysCatalogPersonBo bo) { + bo.setUserId(LoginHelper.getUserId()); LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } @@ -80,9 +82,11 @@ public class SysCatalogPersonServiceImpl implements ISysCatalogPersonService { */ @Override public Boolean insertByBo(SysCatalogPersonBo bo) { + Long userId = LoginHelper.getUserId(); SysCatalogPerson info = baseMapper.selectById(bo.getParentId()); SysCatalogPerson add = MapstructUtils.convert(bo, SysCatalogPerson.class); add.setAncestors(info.getAncestors() + StringUtils.SEPARATOR + add.getParentId()); + add.setUserId(userId); return baseMapper.insert(add) > 0; } @@ -111,7 +115,7 @@ public class SysCatalogPersonServiceImpl implements ISysCatalogPersonService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(SysCatalogPerson entity){ + private void validEntityBeforeSave(SysCatalogPerson entity) { //TODO 做一些数据校验,如唯一约束 }