修改bug

yz_08

2021-03-05 8a2f817bc1a489f873e048d36e24f355bdb55756

修改bug

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java

@@ -901,6 +901,9 @@
                if (StringUtils.isNotBlank(empBaseInfo.getEmpCardStatus())) {
                    p.or().in("a.EmpCardStatus", empBaseInfo.getEmpCardStatus().split(","));
                }
                if (StringUtils.isNotBlank(empBaseInfo.getEmpType())) {
                    p.or().in("a.empType", empBaseInfo.getEmpType().split(","));
                }
            });
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));

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

@@ -18,7 +18,6 @@
import java.util.Map;

/**
*
* name:Dicitem
* package:cc.mrbird.febs.server.system.controller
* description:数据字典项控制器
@@ -42,13 +41,14 @@
public FebsResponse getAllDicitems(DicItem dicitem) {
return new FebsResponse().data(dicitemService.findDicItems(dicitem));
}

    @GetMapping(value = "/type/{dictType}")
    public FebsResponse dictType(@PathVariable String 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));