Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-04 cfce5a0402f09b7f7891f045a77b8a9ceea69e1f

 febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java

@@ -39,11 +39,16 @@
    private final IDicService dicService;

@GetMapping
@PreAuthorize("hasAuthority('dicitem:list')")
public FebsResponse getAllDicitems(DicItem dicitem) {
return new FebsResponse().data(dicitemService.findDicItems(dicitem));
}

    @GetMapping(value = "/type/{dictType}")
    public FebsResponse dictType(@PathVariable String dictType)
    {
        DicItem dicItem=new DicItem();
        dicItem.setDicCode(dictType);
        return new FebsResponse().data(dicitemService.findDicItems(dicItem));
    }
@GetMapping("list")
public FebsResponse dicitemList(QueryRequest request, DicItem dicitem) {
Map<String, Object> dataTable = FebsUtil.getDataTable(this.dicitemService.findDicItems(request, dicitem));