|
@@ -834,7 +834,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
|
|
String end = paramsMap.get("endDate");
|
|
String end = paramsMap.get("endDate");
|
|
|
|
|
|
QueryWrapper<BillSubsidy> subsidyQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<BillSubsidy> subsidyQueryWrapper = new QueryWrapper<>();
|
|
- subsidyQueryWrapper.like("detailed_adress_code", code)
|
|
|
|
|
|
+ subsidyQueryWrapper.like(StringUtils.isNotBlank(code),"detailed_adress_code", code)
|
|
.between("create_time", start, end).eq("subsidy_sch", 3).eq("is_pay", 1)
|
|
.between("create_time", start, end).eq("subsidy_sch", 3).eq("is_pay", 1)
|
|
.groupBy("id_card");
|
|
.groupBy("id_card");
|
|
List<BillSubsidy> subsidyList = subsidyMapper.selectList(subsidyQueryWrapper);
|
|
List<BillSubsidy> subsidyList = subsidyMapper.selectList(subsidyQueryWrapper);
|