Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-05 890be4f01daefbca6f085bb8314d40de282c1db8

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