From 0f6b86abce3a005da76cf963b05b3a1c12817b63 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Wed, 30 Aug 2023 00:50:43 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.0=E3=80=91=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=A7=9F=E6=88=B7id=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roses/kernel/file/modular/entity/SysFileBusiness.java  | 7 -------
 .../roses/kernel/stat/modular/entity/ClickCount.java       | 7 -------
 .../roses/kernel/stat/modular/entity/ClickStatus.java      | 7 -------
 .../stat/modular/service/impl/ClickCountServiceImpl.java   | 2 --
 .../stat/modular/service/impl/ClickStatusServiceImpl.java  | 2 --
 .../roses/kernel/sys/modular/user/entity/SysUserOrg.java   | 6 ------
 .../roses/kernel/sys/modular/user/entity/SysUserRole.java  | 7 -------
 .../kernel/sys/modular/menu/entity/SysMenuOptions.java     | 7 -------
 .../kernel/sys/modular/role/entity/SysRoleMenuOptions.java | 7 -------
 .../sys/modular/tablewidth/entity/SysTableWidth.java       | 7 -------
 10 files changed, 59 deletions(-)

diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/entity/SysFileBusiness.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/entity/SysFileBusiness.java
index e0a3def1f..55c9cd059 100644
--- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/entity/SysFileBusiness.java
+++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/entity/SysFileBusiness.java
@@ -55,11 +55,4 @@ public class SysFileBusiness extends BaseEntity {
     @ChineseDescription("下载次数")
     private Integer downloadCount;
 
-    /**
-     * 租户id
-     */
-    @TableField("tenant_id")
-    @ChineseDescription("租户id")
-    private Long tenantId;
-
 }
diff --git a/kernel-s-stat/stat-business/src/main/java/cn/stylefeng/roses/kernel/stat/modular/entity/ClickCount.java b/kernel-s-stat/stat-business/src/main/java/cn/stylefeng/roses/kernel/stat/modular/entity/ClickCount.java
index fb6f9fdcb..60957983a 100644
--- a/kernel-s-stat/stat-business/src/main/java/cn/stylefeng/roses/kernel/stat/modular/entity/ClickCount.java
+++ b/kernel-s-stat/stat-business/src/main/java/cn/stylefeng/roses/kernel/stat/modular/entity/ClickCount.java
@@ -48,11 +48,4 @@ public class ClickCount extends BaseEntity {
     @ChineseDescription("点击次数")
     private Long clickCount;
 
-    /**
-     * 租户id
-     */
-    @TableField("tenant_id")
-    @ChineseDescription("租户id")
-    private Long tenantId;
-
 }
diff --git a/kernel-s-stat/stat-business/src/main/java/cn/stylefeng/roses/kernel/stat/modular/entity/ClickStatus.java b/kernel-s-stat/stat-business/src/main/java/cn/stylefeng/roses/kernel/stat/modular/entity/ClickStatus.java
index f37ed8f41..3e8b17a32 100644
--- a/kernel-s-stat/stat-business/src/main/java/cn/stylefeng/roses/kernel/stat/modular/entity/ClickStatus.java
+++ b/kernel-s-stat/stat-business/src/main/java/cn/stylefeng/roses/kernel/stat/modular/entity/ClickStatus.java
@@ -48,11 +48,4 @@ public class ClickStatus extends BaseEntity {
     @ChineseDescription("业务的分类标识")
     private String businessType;
 
-    /**
-     * 租户id
-     */
-    @TableField("tenant_id")
-    @ChineseDescription("租户id")
-    private Long tenantId;
-
 }
diff --git a/kernel-s-stat/stat-business/src/main/java/cn/stylefeng/roses/kernel/stat/modular/service/impl/ClickCountServiceImpl.java b/kernel-s-stat/stat-business/src/main/java/cn/stylefeng/roses/kernel/stat/modular/service/impl/ClickCountServiceImpl.java
index db64f7a8a..4195e37b0 100644
--- a/kernel-s-stat/stat-business/src/main/java/cn/stylefeng/roses/kernel/stat/modular/service/impl/ClickCountServiceImpl.java
+++ b/kernel-s-stat/stat-business/src/main/java/cn/stylefeng/roses/kernel/stat/modular/service/impl/ClickCountServiceImpl.java
@@ -143,13 +143,11 @@ public class ClickCountServiceImpl extends ServiceImpl<ClickCountMapper, ClickCo
         String businessType = portalClickCountRequest.getBusinessType();
         Long businessKeyId = portalClickCountRequest.getBusinessKeyId();
         Long clickCount = portalClickCountRequest.getClickCount();
-        Long tenantId = portalClickCountRequest.getTenantId();
 
         queryWrapper.eq(ObjectUtil.isNotNull(clickCountId), ClickCount::getClickCountId, clickCountId);
         queryWrapper.like(ObjectUtil.isNotEmpty(businessType), ClickCount::getBusinessType, businessType);
         queryWrapper.eq(ObjectUtil.isNotNull(businessKeyId), ClickCount::getBusinessKeyId, businessKeyId);
         queryWrapper.eq(ObjectUtil.isNotNull(clickCount), ClickCount::getClickCount, clickCount);
-        queryWrapper.eq(ObjectUtil.isNotNull(tenantId), ClickCount::getTenantId, tenantId);
 
         return queryWrapper;
     }
diff --git a/kernel-s-stat/stat-business/src/main/java/cn/stylefeng/roses/kernel/stat/modular/service/impl/ClickStatusServiceImpl.java b/kernel-s-stat/stat-business/src/main/java/cn/stylefeng/roses/kernel/stat/modular/service/impl/ClickStatusServiceImpl.java
index ba192787e..9ca64f115 100644
--- a/kernel-s-stat/stat-business/src/main/java/cn/stylefeng/roses/kernel/stat/modular/service/impl/ClickStatusServiceImpl.java
+++ b/kernel-s-stat/stat-business/src/main/java/cn/stylefeng/roses/kernel/stat/modular/service/impl/ClickStatusServiceImpl.java
@@ -145,13 +145,11 @@ public class ClickStatusServiceImpl extends ServiceImpl<ClickStatusMapper, Click
         Long userId = portalClickStatusRequest.getUserId();
         Long businessKeyId = portalClickStatusRequest.getBusinessKeyId();
         String businessType = portalClickStatusRequest.getBusinessType();
-        Long tenantId = portalClickStatusRequest.getTenantId();
 
         queryWrapper.eq(ObjectUtil.isNotNull(clickStatusId), ClickStatus::getClickStatusId, clickStatusId);
         queryWrapper.eq(ObjectUtil.isNotNull(userId), ClickStatus::getUserId, userId);
         queryWrapper.eq(ObjectUtil.isNotNull(businessKeyId), ClickStatus::getBusinessKeyId, businessKeyId);
         queryWrapper.like(ObjectUtil.isNotEmpty(businessType), ClickStatus::getBusinessType, businessType);
-        queryWrapper.eq(ObjectUtil.isNotNull(tenantId), ClickStatus::getTenantId, tenantId);
 
         return queryWrapper;
     }
diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUserOrg.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUserOrg.java
index 3753a8761..c092d5482 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUserOrg.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUserOrg.java
@@ -78,11 +78,5 @@ public class SysUserOrg extends BaseEntity {
     @TableField(value = "expand_field", typeHandler = JacksonTypeHandler.class)
     @ChineseDescription("拓展字段")
     private Map<String, Object> expandField;
-    /**
-     * 租户id
-     */
-    @TableField("tenant_id")
-    @ChineseDescription("租户id")
-    private Long tenantId;
 
 }
diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUserRole.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUserRole.java
index e47ac7301..204f0b33e 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUserRole.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUserRole.java
@@ -41,11 +41,4 @@ public class SysUserRole extends BaseEntity {
     @ChineseDescription("角色id")
     private Long roleId;
 
-    /**
-     * 租户号
-     */
-    @TableField("tenant_id")
-    @ChineseDescription("租户号")
-    private Long tenantId;
-
 }
diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/entity/SysMenuOptions.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/entity/SysMenuOptions.java
index c7991ccd0..58de0c7e3 100644
--- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/entity/SysMenuOptions.java
+++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/entity/SysMenuOptions.java
@@ -55,11 +55,4 @@ public class SysMenuOptions extends BaseEntity {
     @ChineseDescription("功能或操作的编码")
     private String optionCode;
 
-    /**
-     * 租户号
-     */
-    @TableField("tenant_id")
-    @ChineseDescription("租户号")
-    private Long tenantId;
-
 }
diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/entity/SysRoleMenuOptions.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/entity/SysRoleMenuOptions.java
index 8a85d5e9c..ca921ce7b 100644
--- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/entity/SysRoleMenuOptions.java
+++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/entity/SysRoleMenuOptions.java
@@ -55,11 +55,4 @@ public class SysRoleMenuOptions extends BaseEntity {
     @ChineseDescription("菜单功能id，关联sys_menu_options主键id")
     private Long menuOptionId;
 
-    /**
-     * 租户号
-     */
-    @TableField("tenant_id")
-    @ChineseDescription("租户号")
-    private Long tenantId;
-
 }
diff --git a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/tablewidth/entity/SysTableWidth.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/tablewidth/entity/SysTableWidth.java
index d37a2d077..0be9eb8e7 100644
--- a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/tablewidth/entity/SysTableWidth.java
+++ b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/tablewidth/entity/SysTableWidth.java
@@ -55,11 +55,4 @@ public class SysTableWidth extends BaseEntity {
     @ChineseDescription("自定义列是否显示、宽度、顺序和列的锁定，一段json")
     private String tableWidthJson;
 
-    /**
-     * 租户号
-     */
-    @TableField("tenant_id")
-    @ChineseDescription("租户号")
-    private Long tenantId;
-
 }