add

qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysRoleDept.java

@@ -0,0 +1,38 @@
+package com.qiaoba.api.system.entity;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * 角色和部门关联 sys_role_dept
+ *
+ * @author ailanyin
+ * @version 1.0
+ * @since 2022-09-22 04:20:28
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+public class SysRoleDept {
+
+    /**
+     * 角色ID
+     */
+    private String roleId;
+
+    /**
+     * 部门ID
+     */
+    private String deptId;
+
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
+    public SysRoleDept(String roleId, String deptId) {
+        this.roleId = roleId;
+        this.deptId = deptId;
+    }
+}

qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/DataScopeDto.java

@@ -0,0 +1,38 @@
+package com.qiaoba.api.system.entity.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Set;
+
+/**
+ * 角色数据权限
+ *
+ * @author ailanyin
+ * @version 1.0
+ * @since 2023/5/8 15:54
+ */
+@Getter
+@Setter
+public class DataScopeDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 角色ID
+     */
+    private String roleId;
+
+    /**
+     * 数据权限
+     */
+    private String dataScope;
+
+    /**
+     * 部门组（数据权限）
+     */
+    private Set<String> deptIds;
+
+
+}

qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysRoleParam.java

@@ -20,5 +20,12 @@ public class SysRoleParam implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private String roleName;
+
+    private String roleKey;
+
     private String status;
+
+    private String beginTime;
+
+    private String endTime;
 }

qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysUserParam.java

@@ -26,6 +26,8 @@ public class SysUserParam implements Serializable {
 
     private String deptId;
 
+    private String roleId;
+
     private String status;
 
     private String isDelete;

qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysDeptApiService.java

@@ -1,5 +1,6 @@
 package com.qiaoba.api.system.service;
 
+import cn.hutool.core.lang.tree.Tree;
 import com.qiaoba.api.system.entity.SysDept;
 import com.qiaoba.api.system.entity.param.SysDeptParam;
 
@@ -53,4 +54,19 @@ public interface SysDeptApiService {
      * @return > 0 = success
      */
     int deleteById(Long deptId);
+
+    /**
+     * 构建前端部门树
+     *
+     * @return tree
+     */
+    List<Tree<String>> selectDeptTree();
+
+    /**
+     * 根据角色ID查询部门树信息
+     *
+     * @param roleId 角色ID
+     * @return 选中部门列表
+     */
+    List<String> selectDeptIdsByRoleId(String roleId);
 }

qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysRoleApiService.java

@@ -1,6 +1,7 @@
 package com.qiaoba.api.system.service;
 
 import com.qiaoba.api.system.entity.SysRole;
+import com.qiaoba.api.system.entity.dto.DataScopeDto;
 import com.qiaoba.api.system.entity.dto.SysRoleDto;
 import com.qiaoba.api.system.entity.param.SysRoleParam;
 
@@ -62,4 +63,12 @@ public interface SysRoleApiService {
      * @return  > 0 = success
      */
     int deleteByIds(List<String> ids);
+
+    /**
+     * 修改数据权限信息
+     *
+     * @param dto 角色ID + deptIds
+     * @return 结果
+     */
+    int authDataScope(DataScopeDto dto);
 }

qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysUserApiService.java

@@ -56,7 +56,7 @@ public interface SysUserApiService {
     /**
      * 批量删除
      *
-     * @param userIds userIds
+     * @param userIds      userIds
      * @param isSoftDelete 是否软删除
      * @return 结果
      */
@@ -65,8 +65,8 @@ public interface SysUserApiService {
     /**
      * 用户绑定角色
      *
-     * @param userId userId
-     * @param roleIds roleIds
+     * @param userId   userId
+     * @param roleIds  roleIds
      * @param isUpdate 是否是更新操作
      */
     void handleUserRole(String userId, Set<String> roleIds, boolean isUpdate);
@@ -78,4 +78,5 @@ public interface SysUserApiService {
      * @return list
      */
     List<SysUserVo> selectVoList(SysUserParam param);
+
 }