add: 增加组织机构对数据权限的配置接口

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
 import com.tianbo.warehouse.annotation.LogAnnotation;
 import com.tianbo.warehouse.controller.response.ResultJson;
 import com.tianbo.warehouse.model.ROLE;
+import com.tianbo.warehouse.model.RoleDataPermission;
 import com.tianbo.warehouse.model.RolePermission;
 import com.tianbo.warehouse.service.RoleService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +54,17 @@ public class RoleController {
         return i==1 ? new ResultJson("200","设置权限成功") :new ResultJson("500","设置权限失败");
     }
 
+    /**
+     * 设置角色的的数据权限
+     * @return
+     */
+    @LogAnnotation(moduleName = "数据权限设置",operate = "数据权限设置接口")
+    @PostMapping("/dataPermSet")
+    public ResultJson dataPermissionSet(@RequestBody RoleDataPermission roleDataPermission){
+        int i = roleService.setRoleDataPermissoin(roleDataPermission);
+        return i==1 ? new ResultJson("200","设置权限成功") :new ResultJson("500","设置权限失败");
+    }
+
     @LogAnnotation(moduleName = "岗位/角色管理",operate = "岗位/角色修改")
     @PutMapping("/edit")
     @ResponseBody

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.RoleDataPermission;
+
+public interface RoleDataPermissionDao {
+    int deleteByPrimaryKey(Integer id);
+
+    int delPermByRoleId(Integer id);
+
+    int insert(RoleDataPermission record);
+
+    int insertSelective(RoleDataPermission record);
+
+    int insertRoleDataPerm(RoleDataPermission record);
+
+    RoleDataPermission selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(RoleDataPermission record);
+
+    int updateByPrimaryKey(RoleDataPermission record);
+}

+package com.tianbo.warehouse.model;
+
+import java.io.Serializable;
+import java.util.List;
+
+import lombok.Data;
+
+/**
+ * role_data_permission
+ * @author
+ */
+@Data
+public class RoleDataPermission implements Serializable {
+    private Integer id;
+
+    private Integer roleId;
+
+    private Integer permissionId;
+
+    private List<Integer> permissionIds;
+
+    private static final long serialVersionUID = 1L;
+}

@@ -2,6 +2,7 @@ package com.tianbo.warehouse.service;
 
 import com.github.pagehelper.PageInfo;
 import com.tianbo.warehouse.model.ROLE;
+import com.tianbo.warehouse.model.RoleDataPermission;
 import com.tianbo.warehouse.model.RolePermission;
 
 import java.util.List;
@@ -17,6 +18,8 @@ public interface RoleService {
 
     int setRolePermissoin(RolePermission record);
 
+    int setRoleDataPermissoin(RoleDataPermission record);
+
     int updateByPrimaryKeySelective(ROLE role);
 
     int deleteByPrimaryKey(Integer departmentId);

@@ -6,9 +6,11 @@ import com.github.pagehelper.PageInfo;
 import com.tianbo.warehouse.annotation.cache.annotation.RedisCacheDelTarget;
 import com.tianbo.warehouse.dao.DepartmentMapper;
 import com.tianbo.warehouse.dao.ROLEMapper;
+import com.tianbo.warehouse.dao.RoleDataPermissionDao;
 import com.tianbo.warehouse.dao.RolePermissionMapper;
 import com.tianbo.warehouse.model.Department;
 import com.tianbo.warehouse.model.ROLE;
+import com.tianbo.warehouse.model.RoleDataPermission;
 import com.tianbo.warehouse.model.RolePermission;
 import com.tianbo.warehouse.service.PermissionService;
 import com.tianbo.warehouse.service.RoleService;
@@ -31,6 +33,9 @@ public class RoleServiceImp implements RoleService{
     private RolePermissionMapper rolePermissionMapper;
 
     @Resource
+    private RoleDataPermissionDao roleDataPermissionDao;
+
+    @Resource
     DepartmentMapper departmentMapper;
 
     @Autowired
@@ -135,6 +140,19 @@ public class RoleServiceImp implements RoleService{
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int setRoleDataPermissoin(RoleDataPermission record) {
+        Integer roleId = record.getRoleId();
+        List<Integer> permissions = record.getPermissionIds();
+        //这里加个判定，如果前端提交的权限列表是空的，代表清空这个角色的所有权限,防止SQL出错
+        if (null!=permissions && !permissions.isEmpty()){
+            roleDataPermissionDao.delPermByRoleId(roleId);
+            return roleDataPermissionDao.insertRoleDataPerm(record);
+        }
+        return 0;
+    }
+
+    @Override
     public int updateByPrimaryKeySelective(ROLE company) {
         return roleMapper.updateByPrimaryKeySelective(company);
     }

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tianbo.warehouse.dao.RoleDataPermissionDao">
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.RoleDataPermission">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="role_id" jdbcType="INTEGER" property="roleId" />
+    <result column="permission_id" jdbcType="INTEGER" property="permissionId" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, role_id, permission_id
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from role_data_permission
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from role_data_permission
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="delPermByRoleId" parameterType="java.lang.Integer">
+    delete from role_data_permission
+    where role_id = #{roleId,jdbcType=INTEGER}
+  </delete>
+
+  <insert id="insertRoleDataPerm" parameterType="com.tianbo.warehouse.model.RoleDataPermission">
+    insert into role_data_permission(role_id, permission_id)
+    values
+    <foreach collection="permissionIds" item="rolePem" index="index"  separator=",">
+      <if test="rolePem !=null">
+        (#{roleId,jdbcType=INTEGER},#{rolePem,jdbcType=INTEGER})
+      </if>
+    </foreach>
+  </insert>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.tianbo.warehouse.model.RoleDataPermission" useGeneratedKeys="true">
+    insert into role_data_permission (role_id, permission_id)
+    values (#{roleId,jdbcType=INTEGER}, #{permissionId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.tianbo.warehouse.model.RoleDataPermission" useGeneratedKeys="true">
+    insert into role_data_permission
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="roleId != null">
+        role_id,
+      </if>
+      <if test="permissionId != null">
+        permission_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="roleId != null">
+        #{roleId,jdbcType=INTEGER},
+      </if>
+      <if test="permissionId != null">
+        #{permissionId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.RoleDataPermission">
+    update role_data_permission
+    <set>
+      <if test="roleId != null">
+        role_id = #{roleId,jdbcType=INTEGER},
+      </if>
+      <if test="permissionId != null">
+        permission_id = #{permissionId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.RoleDataPermission">
+    update role_data_permission
+    set role_id = #{roleId,jdbcType=INTEGER},
+      permission_id = #{permissionId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>