Merge remote-tracking branch 'origin/master'

孔

2021-06-23 bb3139e62038f3c165253cf5724325092966be78

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

@@ -1167,8 +1167,8 @@
                @Override
                public void accept(QueryWrapper<EmpBaseInfo> wrapper) {
                    for (int i = 0; i < certificates.length; i++) {
                        String ageBtn =  certificates[i] ;
                        wrapper.or().gt("LOCATE('"+ageBtn+"',certificateList)",0);
                        String ageBtn = "|" + certificates[i] + "|";
                        wrapper.gt("LOCATE('"+ageBtn+"',CONCAT('|',replace( certificateList, ',', '|,|'),'|'))",0);
                    }
                }
            };