去除数据源权限管理 - 新增获取当前用户部门信息

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DataSourceConfigController.java

@@ -30,14 +30,12 @@ public class DataSourceConfigController {
 
     @PostMapping("/create")
     @Operation(summary = "创建数据源配置")
-    @PreAuthorize("@ss.hasPermission('infra:data-source-config:create')")
     public CommonResult<Long> createDataSourceConfig(@Valid @RequestBody DataSourceConfigSaveReqVO createReqVO) {
         return success(dataSourceConfigService.createDataSourceConfig(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新数据源配置")
-    @PreAuthorize("@ss.hasPermission('infra:data-source-config:update')")
     public CommonResult<Boolean> updateDataSourceConfig(@Valid @RequestBody DataSourceConfigSaveReqVO updateReqVO) {
         dataSourceConfigService.updateDataSourceConfig(updateReqVO);
         return success(true);
@@ -46,7 +44,6 @@ public class DataSourceConfigController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除数据源配置")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('infra:data-source-config:delete')")
     public CommonResult<Boolean> deleteDataSourceConfig(@RequestParam("id") Long id) {
         dataSourceConfigService.deleteDataSourceConfig(id);
         return success(true);
@@ -55,7 +52,6 @@ public class DataSourceConfigController {
     @GetMapping("/get")
     @Operation(summary = "获得数据源配置")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('infra:data-source-config:query')")
     public CommonResult<DataSourceConfigRespVO> getDataSourceConfig(@RequestParam("id") Long id) {
         DataSourceConfigDO config = dataSourceConfigService.getDataSourceConfig(id);
         return success(BeanUtils.toBean(config, DataSourceConfigRespVO.class));
@@ -63,7 +59,6 @@ public class DataSourceConfigController {
 
     @GetMapping("/list")
     @Operation(summary = "获得数据源配置列表")
-    @PreAuthorize("@ss.hasPermission('infra:data-source-config:query')")
     public CommonResult<List<DataSourceConfigRespVO>> getDataSourceConfigList() {
         List<DataSourceConfigDO> list = dataSourceConfigService.getDataSourceConfigList();
         return success(BeanUtils.toBean(list, DataSourceConfigRespVO.class));

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java

@@ -3,12 +3,15 @@ package cn.iocoder.yudao.module.system.controller.admin.dept;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptSaveReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -21,6 +24,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 
 @Tag(name = "管理后台 - 部门")
 @RestController
@@ -30,6 +34,8 @@ public class DeptController {
 
     @Resource
     private DeptService deptService;
+    @Resource
+    private AdminUserService userService;
 
     @PostMapping("create")
     @Operation(summary = "创建部门")
@@ -81,4 +87,16 @@ public class DeptController {
         return success(BeanUtils.toBean(dept, DeptRespVO.class));
     }
 
+
+    @GetMapping("/getUserDept")
+    @Operation(summary = "获取当前登录用户部门信息")
+    public CommonResult<DeptRespVO> getUserDept() {
+        LoginUser loginUser = getLoginUser();
+        DeptDO dept = null;
+        if (loginUser != null) {
+            AdminUserDO user = userService.getUser(loginUser.getId());
+            dept = deptService.getDept(user.getDeptId());
+        }
+        return success(BeanUtils.toBean(dept, DeptRespVO.class));
+    }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java

@@ -12,8 +12,6 @@ import java.util.Set;
 
 /**
  * 部门 Service 接口
- *
-
  */
 public interface DeptService {
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java

@@ -26,8 +26,6 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 
 /**
  * 部门 Service 实现类
- *
-
  */
 @Service
 @Validated
@@ -56,7 +54,7 @@ public class DeptServiceImpl implements DeptService {
 
             dept.setLevel(0);
             dept.setFlag(dept.getId().toString());
-        }else {
+        } else {
 
             //获取上级部门信息
             DeptDO patentDeptDO = getDept(dept.getParentId());
@@ -91,8 +89,8 @@ public class DeptServiceImpl implements DeptService {
         // 更新部门
         DeptDO updateObj = BeanUtils.toBean(updateReqVO, DeptDO.class);
 
-        if(updateObj.getLeaderUserId() == null)
+        if (updateObj.getLeaderUserId() == null)
-            updateObj.setLeaderUserId(new Long(0)) ;
+            updateObj.setLeaderUserId(new Long(0));
 
         // 如果变换上级部门
         if (!updateObj.getParentId().toString().equals(oldDeptDO.getParentId().toString())) {