租户模块

hx-base/pom.xml

@@ -43,6 +43,11 @@
             <artifactId>hx-file</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>hx-tenant</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

pom.xml

@@ -168,6 +168,12 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>hx-tenant</artifactId>
+                <version>3.8.5</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -180,6 +186,7 @@
         <module>hx-base</module>
         <module>hx-file</module>
         <module>hx-flow</module>
+        <module>hx-tenant</module>
     </modules>
     <packaging>pom</packaging>
 

ruoyi-admin/pom.xml

@@ -54,6 +54,11 @@
             <artifactId>hx-socket</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>hx-tenant</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -73,6 +73,11 @@ public class SysDept extends BaseEntity {
     private String delFlag;
 
     /**
+     * 租户id
+     */
+    private String tenantId;
+
+    /**
      * 父部门名称
      */
     @TableField(exist = false)
@@ -186,6 +191,14 @@ public class SysDept extends BaseEntity {
         this.children = children;
     }
 
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java

@@ -1,5 +1,6 @@
 package com.ruoyi.common.core.domain.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
@@ -75,9 +76,16 @@ public class SysRole extends BaseEntity {
     /**
      * 用户是否存在此角色标识 默认不存在
      */
+    @TableField(exist = false)
     private boolean flag = false;
 
     /**
+     * 租户id
+     */
+    private String tenantId;
+
+
+    /**
      * 菜单组
      */
     private Long[] menuIds;
@@ -217,6 +225,14 @@ public class SysRole extends BaseEntity {
         this.permissions = permissions;
     }
 
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

ruoyi-common/src/main/java/com/ruoyi/common/utils/wrapper/IWrapper.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.toolkit.LambdaUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.support.LambdaMeta;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.apache.ibatis.reflection.property.PropertyNamer;
 
 import java.util.Collection;
@@ -178,10 +179,10 @@ public class IWrapper<T> extends AbstractWrapper<T, String, IWrapper<T>> impleme
         sqlSelect.toNull();
     }
 
-    public IWrapper<T> keyword(Object value, SqlField... keywordData) {
-        this.and(ObjectUtil.isNotEmpty(value), q -> {
+    public IWrapper<T> keyword(BaseSelectDto selectDto, SqlField... keywordData) {
+        this.and(ObjectUtil.isNotEmpty(selectDto.getKeyword()), q -> {
             for (SqlField keywordDatum : keywordData) {
-                q.or().like(keywordDatum.getName(), value);
+                q.or().like(keywordDatum.getName(), selectDto.getKeyword());
             }
         });
         return typedThis;

ruoyi-framework/src/main/java/com/ruoyi/framework/aspect/LogicAspect.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class LogicAspect {
 
-    @Around("@annotation(logicIgnore)")
+    @Around("@annotation(logicIgnore) || @within(logicIgnore)")
     public Object around(ProceedingJoinPoint point, LogicIgnore logicIgnore) throws Throwable {
         try {
             String[] alias = logicIgnore.alias();

ruoyi-framework/src/main/java/com/ruoyi/framework/aspect/TenantAspect.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class TenantAspect {
 
-    @Around("@annotation(tenantIgnore)")
+    @Around("@annotation(tenantIgnore) || @within(tenantIgnore)")
     public Object around(ProceedingJoinPoint point, TenantIgnore tenantIgnore) throws Throwable {
         try {
             // 开启忽略