diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue index e3a6e6d7f..5e3dac96c 100644 --- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue @@ -637,6 +637,10 @@ export default { courtesyReward:[], activeNewlywedsChildList:[], } + this.form.tableDatas = [] + this.tableDatas = [] + this.pdidlist = [] + this.pddhidlist = [] }, qrcodelook(url) { this.loadingdialog = true diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java index ce66ec69c..5566b5479 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java @@ -163,6 +163,10 @@ public class ActiveNewlywedsServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(ActiveNewlyweds::getStoreId,TokenUtil.getNowAccountInfo().getStoreId()); + if (ObjectUtil.isNotEmpty(activeNewlywedss.getName())) + lambdaQueryWrapper.like(ActiveNewlyweds::getName,activeNewlywedss.getName()); + if (ObjectUtil.isNotEmpty(activeNewlywedss.getIsonline())) + lambdaQueryWrapper.eq(ActiveNewlyweds::getIsonline,activeNewlywedss.getIsonline()); //ActiveNewlyweds activeNewlyweds = getOne(lambdaQueryWrapper); IPage page1 = page(page, lambdaQueryWrapper); List list = page1.getRecords();