提交

孔祥富

2021-03-04 3513da53dffc309a81f6a24c70b90d0cd779c756

提交

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java

@@ -49,7 +49,6 @@
    }

    @PostMapping
    @PreAuthorize("hasAuthority('empAccessory:add')")
    public void addEmpAccessory(@NotNull(message = "{required}") Long labelid,@NotNull(message = "{required}") Long empId, MultipartFile file) throws FebsException {
        try {
            this.empAccessoryService.createEmpAccessory(labelid,file,empId);

 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));

 febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicItemServiceImpl.java

@@ -59,6 +59,7 @@
    public List<DicItem> findDicItems(DicItem dicitem) {
        LambdaQueryWrapper<DicItem> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(DicItem::getDelFlag, 0);
        queryWrapper.eq(DicItem::getDicCode,dicitem.getDicCode());
        return this.baseMapper.selectList(queryWrapper);
    }