diff --git a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/bo/ScopeField.java b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/bo/ScopeField.java deleted file mode 100644 index 83e28ad..0000000 --- a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/bo/ScopeField.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.bgasol.common.core.base.bo; - -import java.lang.annotation.*; - -/** - * 数据权限字段注解 - */ -@Target(ElementType.FIELD) // 只能标记字段 -@Retention(RetentionPolicy.RUNTIME) // 运行时可用 -@Documented -public @interface ScopeField { -} diff --git a/cloud/common/common-base-web/src/main/java/com/bgasol/common/core/base/handler/DataScopeHandler.java b/cloud/common/common-base-web/src/main/java/com/bgasol/common/core/base/handler/DataScopeHandler.java index fc8bb8e..42c2552 100644 --- a/cloud/common/common-base-web/src/main/java/com/bgasol/common/core/base/handler/DataScopeHandler.java +++ b/cloud/common/common-base-web/src/main/java/com/bgasol/common/core/base/handler/DataScopeHandler.java @@ -3,8 +3,8 @@ package com.bgasol.common.core.base.handler; import cn.dev33.satoken.stp.StpUtil; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.handler.MultiDataPermissionHandler; -import com.bgasol.common.core.base.bo.ScopeField; -import com.bgasol.common.core.base.bo.ScopeOptionsBo; +import com.bgasol.model.system.user.bo.ScopeField; +import com.bgasol.model.system.user.bo.ScopeOptionsBo; import com.bgasol.common.core.base.entity.BaseEntity; import com.bgasol.common.core.base.mapper.MyBaseMapper; import com.bgasol.model.system.department.entity.DepartmentEntity; diff --git a/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/bo/ScopeField.java b/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/bo/ScopeField.java new file mode 100644 index 0000000..486c3d8 --- /dev/null +++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/bo/ScopeField.java @@ -0,0 +1,24 @@ +package com.bgasol.model.system.user.bo; + +import com.bgasol.model.system.department.entity.DepartmentEntity; +import com.bgasol.model.system.user.entity.UserEntity; + +import java.lang.annotation.*; +import java.util.List; + + +/** + * 数据权限字段注解 + *
+ * 只能修饰于: + * {@link UserEntity} + * {@link DepartmentEntity} + * 以及其对应的列表类型: + * {@link List} + *
+ */ +@Target(ElementType.FIELD) // 只能标记字段 +@Retention(RetentionPolicy.RUNTIME) // 运行时可用 +@Documented +public @interface ScopeField { +} diff --git a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/bo/ScopeOptionsBo.java b/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/bo/ScopeOptionsBo.java similarity index 94% rename from cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/bo/ScopeOptionsBo.java rename to cloud/model/model-system/src/main/java/com/bgasol/model/system/user/bo/ScopeOptionsBo.java index 8b95008..c126a08 100644 --- a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/bo/ScopeOptionsBo.java +++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/bo/ScopeOptionsBo.java @@ -1,4 +1,4 @@ -package com.bgasol.common.core.base.bo; +package com.bgasol.model.system.user.bo; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/entity/UserEntity.java b/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/entity/UserEntity.java index d739d36..f52cd86 100644 --- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/entity/UserEntity.java +++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/entity/UserEntity.java @@ -2,7 +2,7 @@ package com.bgasol.model.system.user.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.bgasol.common.core.base.bo.ScopeField; +import com.bgasol.model.system.user.bo.ScopeField; import com.bgasol.common.core.base.entity.BaseEntity; import com.bgasol.model.system.department.entity.DepartmentEntity; import com.bgasol.model.system.role.entity.RoleEntity;