From c48146be3add0d1ef3e43c8b8407798c591f3943 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Wed, 30 Oct 2024 14:54:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../yudao-module-home-biz/pom.xml | 7 +++++
.../controller/admin/clgl/ClglController.java | 3 +-
.../controller/admin/qjgl/QjglController.java | 3 +-
.../homeDataPermissionConfiguration.java | 30 +++++++++++++++++++
.../datapermission/package-info.java | 4 +++
5 files changed, 45 insertions(+), 2 deletions(-)
create mode 100644 yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/framework/datapermission/config/homeDataPermissionConfiguration.java
create mode 100644 yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/framework/datapermission/package-info.java
diff --git a/yudao-module-home/yudao-module-home-biz/pom.xml b/yudao-module-home/yudao-module-home-biz/pom.xml
index 075896e..5dc24d6 100644
--- a/yudao-module-home/yudao-module-home-biz/pom.xml
+++ b/yudao-module-home/yudao-module-home-biz/pom.xml
@@ -24,6 +24,13 @@
${revision}
+
+
+
+ cn.iocoder.boot
+ yudao-spring-boot-starter-biz-data-permission
+
+
cn.iocoder.boot
yudao-spring-boot-starter-web
diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/ClglController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/ClglController.java
index 3b517b9..eba3d52 100644
--- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/ClglController.java
+++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/ClglController.java
@@ -76,7 +76,8 @@ public class ClglController {
@Operation(summary = "获得车辆管理分页")
@PreAuthorize("@ss.hasPermission('home:clgl:query')")
public CommonResult> getClglPage(@Valid ClglPageReqVO pageReqVO) {
- PageResult pageResult = clglService.getClglPage(getLoginUserId(),pageReqVO);
+// PageResult pageResult = clglService.getClglPage(getLoginUserId(),pageReqVO);
+ PageResult pageResult = clglService.getClglPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ClglRespVO.class));
}
diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/QjglController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/QjglController.java
index e442511..fb03048 100644
--- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/QjglController.java
+++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/QjglController.java
@@ -79,7 +79,8 @@ public class QjglController {
@Operation(summary = "获得请假管理分页")
@PreAuthorize("@ss.hasPermission('home:qjgl:query')")
public CommonResult> getQjglPage(@Valid QjglPageReqVO pageReqVO) {
- PageResult pageResult = qjglService.getQjglPage(getLoginUserId(),pageReqVO);
+// PageResult pageResult = qjglService.getQjglPage(getLoginUserId(),pageReqVO);
+ PageResult pageResult = qjglService.getQjglPage(pageReqVO);
// return success(BeanUtils.toBean(pageResult, QjglRespVO.class));
if (CollUtil.isEmpty(pageResult.getList())) {
diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/framework/datapermission/config/homeDataPermissionConfiguration.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/framework/datapermission/config/homeDataPermissionConfiguration.java
new file mode 100644
index 0000000..40e4d32
--- /dev/null
+++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/framework/datapermission/config/homeDataPermissionConfiguration.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.home.framework.datapermission.config;
+
+import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer;
+import cn.iocoder.yudao.module.home.dal.dataobject.clgl.ClglDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * system 模块的数据权限 Configuration
+ *
+ * @author 芋道源码
+ */
+@Configuration(proxyBeanMethods = false)
+public class homeDataPermissionConfiguration {
+
+ @Bean
+ public DeptDataPermissionRuleCustomizer homeDeptDataPermissionRuleCustomizer() {
+ return rule -> {
+ // dept
+ rule.addDeptColumn(ClglDO.class, "dept");
+ // rule.addDeptColumn(DeptDO.class, "id");
+ // user
+ // AdminUserDO 是想要使用权限的表 id 是对那个字段生效 比如 这个表 user_id 使用户id 那就使用 user_id
+ // rule.addUserColumn(AdminUserDO.class, "id");
+ };
+ }
+
+}
diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/framework/datapermission/package-info.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/framework/datapermission/package-info.java
new file mode 100644
index 0000000..1fc23fe
--- /dev/null
+++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/framework/datapermission/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * system 模块的数据权限配置
+ */
+package cn.iocoder.yudao.module.home.framework.datapermission;