From 5b1efd51cbc80646bf69c214d3df664e0f512e41 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 13 Mar 2020 11:56:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E9=87=8F=E5=85=83=E7=B4=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/MicroelementFacade.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java index 77badfa..b579cac 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java @@ -327,10 +327,21 @@ public class MicroelementFacade { isNormal = true; continue; } - MicroelementConfigModel configModel = mongoTemplate.findOne( - Query.query(Criteria.where("eleName").is(ele.getEleName()).and("status").is(ele.getStatus()).and("type").is(1) - .and("startWeek").gte(month).and("endWeek").lte(month)), MicroelementConfigModel.class); - contents.put(configModel.getEleName(),configModel.getContents()); + Query query1 = Query.query(Criteria.where("eleName").is(ele.getEleName()).and("status").is(ele.getStatus()).and("type").is(1)); + List configModels = mongoTemplate.find(query1 + , MicroelementConfigModel.class); + if (CollectionUtils.isNotEmpty(configModels)) + { + for (MicroelementConfigModel configModel : configModels) + { + if (configModel.getStartWeek() >= month && month <= configModel.getEndWeek()) + { + contents.put(configModel.getEleName(),configModel.getContents()); + break; + } + } + } + } } -- 1.8.3.1