From 5b660cd9a96d9b60a1413e118d7a385251468c3e Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Wed, 28 May 2025 18:07:52 +0800 Subject: [PATCH] =?UTF-8?q?system=E5=BE=AE=E6=9C=8D=E5=8A=A1=E6=9A=82?= =?UTF-8?q?=E6=97=B6=E7=A7=BB=E9=99=A4datapermission?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cf-module-system/cf-module-system-biz/pom.xml | 8 --- .../admin/user/UserProfileController.java | 2 - .../config/DataPermissionConfiguration.java | 56 +++++++++---------- .../system/service/dept/DeptServiceImpl.java | 2 - .../permission/PermissionServiceImpl.java | 2 - .../service/sms/SmsSendServiceImpl.java | 2 - 6 files changed, 28 insertions(+), 44 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/pom.xml b/cf-module-system/cf-module-system-biz/pom.xml index 4ec052004..c6361279a 100644 --- a/cf-module-system/cf-module-system-biz/pom.xml +++ b/cf-module-system/cf-module-system-biz/pom.xml @@ -58,10 +58,6 @@ com.cf.imes cf-spring-boot-starter-biz-dict - - com.cf.imes - cf-spring-boot-starter-biz-data-permission - com.cf.imes cf-spring-boot-starter-biz-organ @@ -264,10 +260,6 @@ com.cf.imes cf-spring-boot-starter-banner - - com.cf.imes - cf-spring-boot-starter-biz-data-permission - com.cf.imes cf-spring-boot-starter-biz-dict diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/UserProfileController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/UserProfileController.java index 81f752d74..c8ae4f23b 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/UserProfileController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/UserProfileController.java @@ -2,7 +2,6 @@ package com.cf.imes.module.system.controller.admin.user; import com.cf.imes.framework.common.enums.UserTypeEnum; import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.framework.datapermission.core.annotation.DataPermission; import com.cf.imes.module.system.controller.admin.user.vo.profile.UserMobileUpdateReqVO; import com.cf.imes.module.system.controller.admin.user.vo.profile.UserProfileRespVO; import com.cf.imes.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO; @@ -56,7 +55,6 @@ public class UserProfileController { @GetMapping("/get") @Operation(summary = "获得登录用户信息") - @DataPermission(enable = false) // 关闭数据权限，避免只查看自己时，查询不到部门。 public CommonResult getUserProfile() { // 获得用户基本信息 AdminUserDO user = userService.getUser(getLoginUserId()); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/datapermission/config/DataPermissionConfiguration.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/datapermission/config/DataPermissionConfiguration.java index eca9475ce..4c991e78a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/datapermission/config/DataPermissionConfiguration.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/datapermission/config/DataPermissionConfiguration.java @@ -1,28 +1,28 @@ -package com.cf.imes.module.system.framework.datapermission.config; - -import com.cf.imes.module.system.dal.dataobject.dept.DeptDO; -import com.cf.imes.module.system.dal.dataobject.user.AdminUserDO; -import com.cf.imes.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * system 模块的数据权限 Configuration - * - * @author 晨丰科技 - */ -@Configuration(proxyBeanMethods = false) -public class DataPermissionConfiguration { - - @Bean - public DeptDataPermissionRuleCustomizer sysDeptDataPermissionRuleCustomizer() { - return rule -> { - // dept - rule.addDeptColumn(AdminUserDO.class); - rule.addDeptColumn(DeptDO.class, "id"); - // user - rule.addUserColumn(AdminUserDO.class, "id"); - }; - } - -} +//package com.cf.imes.module.system.framework.datapermission.config; +// +//import com.cf.imes.module.system.dal.dataobject.dept.DeptDO; +//import com.cf.imes.module.system.dal.dataobject.user.AdminUserDO; +//import com.cf.imes.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +// +///** +// * system 模块的数据权限 Configuration +// * +// * @author 晨丰科技 +// */ +//@Configuration(proxyBeanMethods = false) +//public class DataPermissionConfiguration { +// +// @Bean +// public DeptDataPermissionRuleCustomizer sysDeptDataPermissionRuleCustomizer() { +// return rule -> { +// // dept +// rule.addDeptColumn(AdminUserDO.class); +// rule.addDeptColumn(DeptDO.class, "id"); +// // user +// rule.addUserColumn(AdminUserDO.class, "id"); +// }; +// } +// +//} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/dept/DeptServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/dept/DeptServiceImpl.java index b73afee2a..d5a438356 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/dept/DeptServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/dept/DeptServiceImpl.java @@ -8,7 +8,6 @@ import com.cf.imes.framework.common.enums.CommonStatusEnum; import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil; import com.cf.imes.framework.common.util.json.JsonUtils; import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.framework.datapermission.core.annotation.DataPermission; import com.cf.imes.framework.organ.core.context.OrganContextHolder; import com.cf.imes.framework.security.core.LoginUser; import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; @@ -286,7 +285,6 @@ public class DeptServiceImpl implements DeptService { } @Override - @DataPermission(enable = false) // 禁用数据权限，避免建立不正确的缓存 @Cacheable(cacheNames = RedisKeyConstants.DEPT_CHILDREN_ID_LIST, key = "#id") public Set getChildDeptIdListFromCache(Long id) { List children = getChildDeptList(id); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java index 32f8f2574..d2142bbad 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java @@ -9,7 +9,6 @@ import com.cf.imes.framework.common.exception.ServiceException; import com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants; import com.cf.imes.framework.common.util.collection.CollectionUtils; import com.cf.imes.framework.common.util.json.JsonUtils; -import com.cf.imes.framework.datapermission.core.annotation.DataPermission; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.organ.core.aop.OrganIgnore; import com.cf.imes.framework.organ.core.context.OrganContextHolder; @@ -649,7 +648,6 @@ public class PermissionServiceImpl implements PermissionService { } @Override - @DataPermission(enable = false) // 关闭数据权限，不然就会出现递归获取数据权限的问题 public DeptDataPermissionRespDTO getDeptDataPermission(Long userId) { // 获得用户的角色 List roles = getEnableUserRoleListByUserIdFromCache(userId); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsSendServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsSendServiceImpl.java index 0530716e8..de110eb69 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsSendServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsSendServiceImpl.java @@ -7,7 +7,6 @@ import cn.hutool.core.lang.Pair; import com.cf.imes.framework.common.enums.CommonStatusEnum; import com.cf.imes.framework.common.enums.UserTypeEnum; import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil; -import com.cf.imes.framework.datapermission.core.annotation.DataPermission; import com.cf.imes.framework.sms.core.client.SmsClient; import com.cf.imes.framework.sms.core.client.dto.SmsReceiveRespDTO; import com.cf.imes.framework.sms.core.client.dto.SmsSendRespDTO; @@ -56,7 +55,6 @@ public class SmsSendServiceImpl implements SmsSendService { private List smsSendAfterSendHandlers; @Override - @DataPermission(enable = false) // 发送短信时，无需考虑数据权限 public Long sendSingleSmsToAdmin(String mobile, Long userId, String templateCode, Map templateParams) { // 如果 mobile 为空，则加载用户编号对应的手机号 if (StringUtils.isEmpty(mobile)) {