优化多角色数据权限匹配规则

RuoYi

2022-08-21 a36dc6635f92b1a6a5ea43c801f028dea08a7f0b

 src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java

@@ -1,6 +1,8 @@
package com.ruoyi.project.system.controller;



import java.util.ArrayList;

import java.util.List;

import javax.servlet.http.HttpServletResponse;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.validation.annotation.Validated;

@@ -12,7 +14,7 @@
import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.utils.SecurityUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.common.utils.poi.ExcelUtil;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

import com.ruoyi.framework.aspectj.lang.enums.BusinessType;

@@ -49,12 +51,12 @@


    @Log(title = "字典数据", businessType = BusinessType.EXPORT)

    @PreAuthorize("@ss.hasPermi('system:dict:export')")

    @GetMapping("/export")

    public AjaxResult export(SysDictData dictData)

    @PostMapping("/export")

    public void export(HttpServletResponse response, SysDictData dictData)

    {

        List<SysDictData> list = dictDataService.selectDictDataList(dictData);

        ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);

        return util.exportExcel(list, "字典数据");

        util.exportExcel(response, list, "字典数据");

    }



    /**

@@ -73,7 +75,12 @@
    @GetMapping(value = "/type/{dictType}")

    public AjaxResult dictType(@PathVariable String dictType)

    {

        return AjaxResult.success(dictTypeService.selectDictDataByType(dictType));

        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);

        if (StringUtils.isNull(data))

        {

            data = new ArrayList<SysDictData>();

        }

        return AjaxResult.success(data);

    }



    /**

@@ -84,7 +91,7 @@
    @PostMapping

    public AjaxResult add(@Validated @RequestBody SysDictData dict)

    {

        dict.setCreateBy(SecurityUtils.getUsername());

        dict.setCreateBy(getUsername());

        return toAjax(dictDataService.insertDictData(dict));

    }



@@ -96,7 +103,7 @@
    @PutMapping

    public AjaxResult edit(@Validated @RequestBody SysDictData dict)

    {

        dict.setUpdateBy(SecurityUtils.getUsername());

        dict.setUpdateBy(getUsername());

        return toAjax(dictDataService.updateDictData(dict));

    }



@@ -108,6 +115,7 @@
    @DeleteMapping("/{dictCodes}")

    public AjaxResult remove(@PathVariable Long[] dictCodes)

    {

        return toAjax(dictDataService.deleteDictDataByIds(dictCodes));

        dictDataService.deleteDictDataByIds(dictCodes);

        return success();

    }

}