system微服务暂时移除datapermission

cf-module-system/cf-module-system-biz/pom.xml

@@ -58,10 +58,6 @@
             <groupId>com.cf.imes</groupId>
             <artifactId>cf-spring-boot-starter-biz-dict</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.cf.imes</groupId>
-            <artifactId>cf-spring-boot-starter-biz-data-permission</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.cf.imes</groupId>
             <artifactId>cf-spring-boot-starter-biz-organ</artifactId>
@@ -264,10 +260,6 @@
                             <groupId>com.cf.imes</groupId>
                             <artifactId>cf-spring-boot-starter-banner</artifactId>
                         </include>
-                        <include>
-                            <groupId>com.cf.imes</groupId>
-                            <artifactId>cf-spring-boot-starter-biz-data-permission</artifactId>
-                        </include>
                         <include>
                             <groupId>com.cf.imes</groupId>
                             <artifactId>cf-spring-boot-starter-biz-dict</artifactId>

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<UserProfileRespVO> getUserProfile() {
         // 获得用户基本信息
         AdminUserDO user = userService.getUser(getLoginUserId());

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");
+//        };
+//    }
+//
+//}

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<Long> getChildDeptIdListFromCache(Long id) {
         List<DeptDO> children = getChildDeptList(id);

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<RoleDO> roles = getEnableUserRoleListByUserIdFromCache(userId);

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<SmsSendAfterSendHandler> smsSendAfterSendHandlers;
 
     @Override
-    @DataPermission(enable = false) // 发送短信时，无需考虑数据权限
     public Long sendSingleSmsToAdmin(String mobile, Long userId, String templateCode, Map<String, Object> templateParams) {
         // 如果 mobile 为空，则加载用户编号对应的手机号
         if (StringUtils.isEmpty(mobile)) {