xx

孔祥富

2021-03-10 b0b4f17b8dfc4a3b99dab13aea57a8792e317691

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

@@ -151,12 +151,12 @@
                    .filter(k -> DicCode.IN_OUT_TYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getEntryType()))
                    .findFirst()
                    .map(DicItem::getDicItemName)
                    .orElse("未知"));
                    .orElse(""));
            p.setDimissionTypeName(dicItems.stream()
                    .filter(k -> DicCode.IN_OUT_TYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getDimissionType()))
                    .findFirst()
                    .map(DicItem::getDicItemName)
                    .orElse("未知"));
                    .orElse(""));
        });
        iPage.setRecords(list);
        return iPage;
@@ -982,6 +982,13 @@
        if (StringUtils.isNotBlank(empBaseInfo.getDimissionType())) {
            queryWrapper.in("a.dimissionType", empBaseInfo.getDimissionType().split(","));
        }
        if (StringUtils.isNotBlank(empBaseInfo.getInOutType())) {
            queryWrapper.and(p->{
                p.in("a.dimissionType", empBaseInfo.getInOutType().split(","));
                p.or().in("a.entryType",empBaseInfo.getInOutType().split(","));
            });
            //queryWrapper.in("a.dimissionType", empBaseInfo.getDimissionType().split(","));
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        return queryWrapper;
    }