From 3272abb854883630db77a4e6a7d7fb3e6d996107 Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Fri, 14 Jun 2024 14:51:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E7=A9=BA=E9=97=B4=E9=99=90?=
 =?UTF-8?q?=E5=AE=9A=E7=94=A8=E6=88=B7id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/system/domain/SysCatalogPerson.java  | 7 ++++---
 .../system/service/impl/SysCatalogPersonServiceImpl.java  | 8 ++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

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<SysCatalogPersonVo> queryList(SysCatalogPersonBo bo) {
+        bo.setUserId(LoginHelper.getUserId());
         LambdaQueryWrapper<SysCatalogPerson> 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 做一些数据校验,如唯一约束
     }