Merge branch 'dev' of wangzhinan/wlyy2.0 into dev

business/es-service/src/main/java/com/yihu/jw/es/service/StatisticsEsService.java

@@ -588,7 +588,7 @@ public class StatisticsEsService {
                object.put("deptName", map.get("name"));
                Integer count = 0;
                for (SaveModel saveModel : saveModels) {
                    if (saveModel.getDept().equalsIgnoreCase(code)) {
                    if (StringUtils.isNoneBlank(saveModel.getDept())&&saveModel.getDept().equalsIgnoreCase(code)) {
                        if (saveModel.getResult1() > 0) {
                            count += 1;
                        }