From c6f8a03a3675efa99a833e16ad34ac0dd0fbc9b0 Mon Sep 17 00:00:00 2001 From: fengjin <1435304038@qq.com> Date: 星期三, 20 九月 2023 17:55:29 +0800 Subject: [PATCH] 1.扫码开门 2. 修改bug --- springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionReportServiceImpl.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionReportServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionReportServiceImpl.java index c3b3af6..dee3a6b 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionReportServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionReportServiceImpl.java @@ -66,13 +66,17 @@ Page page = new Page(unionReportDto.getPageNum(), unionReportDto.getPageSize()); QueryWrapper<UnionReport> unionOutdoorLaborDynamicQueryWrapper = new QueryWrapper<>(); if (unionReportDto.getIsApplets().equals(1)){ - unionOutdoorLaborDynamicQueryWrapper.eq("create_user_id",unionReportDto.getCreateUserId()).eq("type",2); + unionOutdoorLaborDynamicQueryWrapper.eq("create_user_id",unionReportDto.getCreateUserId()); + if (unionReportDto.getType()!=null) + unionOutdoorLaborDynamicQueryWrapper.eq("type",unionReportDto.getType()); if (unionReportDto.getStatus()!=null) unionOutdoorLaborDynamicQueryWrapper.eq("status",unionReportDto.getStatus()); }else if(unionReportDto.getIsApplets().equals(3)){ - unionOutdoorLaborDynamicQueryWrapper.eq("create_union_user_id",unionReportDto.getCreateUnionUserId()).eq("type",2); + unionOutdoorLaborDynamicQueryWrapper.eq("create_union_user_id",unionReportDto.getCreateUnionUserId()).eq("type",unionReportDto.getType()); if (unionReportDto.getStatus()!=null) unionOutdoorLaborDynamicQueryWrapper.eq("status",unionReportDto.getStatus()); + if (unionReportDto.getType()!=null) + unionOutdoorLaborDynamicQueryWrapper.eq("type",unionReportDto.getType()); } Page pageResult = baseMapper.selectPage(page, unionOutdoorLaborDynamicQueryWrapper); pageResult.setTotal(pageResult.getRecords().size()); -- Gitblit v1.7.1