guoyuji
2024-05-13 8b5e637f08bb0ea5b979bd080b379d244ae97143
权限更改使用前端筛选
6个文件已修改
74 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/system/role/RoleList.vue 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionBasicService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionRoleService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/userInfo/PermissionBasicMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/sd/OrderMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/userInfo/PermissionRoleMapper.xml 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/system/role/RoleList.vue
@@ -148,13 +148,16 @@
  }
  for (let columnNameKey in columnNameP) {
    let column = {field: columnNameKey,
      title: columnNameP[columnNameKey]
      title: columnNameP[columnNameKey],
      filterMethod:filterChanged1
    }
    columnsP.push(column)
  }
  permissionOptions.columns = columnsP
})
onMounted(()=>{
  request.get(`/role/findAll`).then(res=>{
@@ -181,16 +184,32 @@
  })
}
const filterChanged1 = ({ option, row }) => {
  return row.page === option.data
}
const selectChange = () => {
  getPermissionList()
  if(selectValue.value===null){
    pGrid.value.clearFilter()
    return
  }
  const column = pGrid.value.getColumnByField('page')
  column.filters =[{ data: '' }]
  const option = column.filters[0]
  option.data = selectValue.value[1]
  option.checked = true
  // 如果是直接修复筛选条件,则需要手动调用 updateData 处理表格数据
  pGrid.value.updateData()
  //getPermissionList()
}
const saveBatch = () => {
  const $grid = pGrid.value
  if($grid.getCheckboxRecords().length === 0){
    ElMessage.warning("请先选择权限")
    return
  }
  // if($grid.getCheckboxRecords().length === 0){
  //   ElMessage.warning("请先选择权限")
  //   return
  // }
  ElMessageBox.confirm(
      '确认修改角色权限?',
      'Warning',
@@ -286,6 +305,7 @@
              v-model="selectValue"
              :options="options"
              @change="selectChange"
              clearable
          />
        </template>
        <template #save_buttons>
@@ -293,7 +313,7 @@
              @click="saveBatch"
              status='primary'
              style="margin-right: 1rem"
          >新增</vxe-button>
          >保存</vxe-button>
        </template>
      </vxe-grid>
north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionBasicService.java
@@ -26,7 +26,6 @@
        List<Map<String,Object>> ListOne = new ArrayList<>();
        for(PermissionBasic permissionBasic : getOne){
            System.out.println(permissionBasic.getMenu());
            Map<String,Object> map = new HashMap<>();
            map.put("value",permissionBasic.getId());
            map.put("label",permissionBasic.getMenu());
north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionRoleService.java
@@ -41,11 +41,10 @@
                        JSONObject.toJSONString(permissionRoleJson.get("detail")),
                        PermissionBasic.class);
        Integer roleId = (Integer) permissionRoleMap.get("id");
        permissionRoleMapper.delete(new QueryWrapper<PermissionRole>().eq("role_id", roleId));
        if(permissionBasics.isEmpty() || roleId == null ){
            return false;
            return true;
        }
        List<PermissionRole> permissionRoles = new ArrayList<>();
        for (PermissionBasic permissionBasic : permissionBasics) {
            PermissionRole permissionRole = new PermissionRole();
@@ -53,7 +52,7 @@
            permissionRole.setPermissionId(permissionBasic.getId());
            permissionRoles.add(permissionRole);
        }
        permissionRoleMapper.delete(new QueryWrapper<PermissionRole>().eq("role_id", roleId));
        return permissionRoleMapper.saveBatch(permissionRoles);
north-glass-erp/src/main/resources/mapper/userInfo/PermissionBasicMapper.xml
@@ -49,7 +49,7 @@
    <select id="selectTowLevel">
        select
            id as value,
            page as value,
            page as label
        from permission_basic
        where
north-glass-erp/target/classes/mapper/sd/OrderMapper.xml
@@ -47,7 +47,7 @@
    <select id="getOrderList">
        select
            *,
        sum(fgi.quantity_available) as goodsQuantity
        ifnull(sum(fgi.quantity_available),0) as goodsQuantity
        from
            `order` as o
        left join mm.finished_goods_inventory as  fgi
north-glass-erp/target/classes/mapper/userInfo/PermissionRoleMapper.xml
@@ -21,6 +21,34 @@
        where a.id = #{loginId}
            and d.state = 1
    </select>
    <select id="getUserEditPermission">
        select
            concat(
                    if(d.page=null || d.page='','',concat(d.page, '.')),
                    d.permission
                ) as 'permission'
        <if test="loginId!=1">
        from user as a
                 left join user_role as e
                           on e.user_id = a.id
                 left join role as b
                           on e.role_id = b.id
                 left join permission_role as c
                           on b.id = c.role_id
                 left join permission_basic d
                           on  d.id = c.permission_id
                           and d.permission='edit'
        where a.id = #{loginId}
        </if>
        <if test="loginId==1">
            from permission_basic d
            where d.permission='edit'
        </if>
            and d.state = 1
        group by  d.id
    </select>
    
    <insert id="saveBatch">
        insert into