Skip to content

A
amos-boot-zx-biz
Commit 379aa2b0 authored by chenzhao's avatar chenzhao
Browse files
Options

Merge remote-tracking branch 'origin/developer_bw' into developer_bw

parents 5540fbcd 8247db38
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/FhdfhServiceImpl.java
View file @ 379aa2b0
...@@ -21,6 +21,7 @@ public class FhdfhServiceImpl implements IExportPageService { ...@@ -21,6 +21,7 @@ public class FhdfhServiceImpl implements IExportPageService {
map.put("preparationMoneyState", "0"); map.put("preparationMoneyState", "0");
if (Objects.nonNull(filters)) { if (Objects.nonNull(filters)) {
map.putAll(filters); map.putAll(filters);
map.put("regionalCompaniesSeq",filters.get("regionalcompaniesSeq"));
} }
return businessFieldMapper.getFhStationId(map); return businessFieldMapper.getFhStationId(map);
} }
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/FhyfhServiceImpl.java
View file @ 379aa2b0
...@@ -20,6 +20,7 @@ public class FhyfhServiceImpl implements IExportPageService { ...@@ -20,6 +20,7 @@ public class FhyfhServiceImpl implements IExportPageService {
map.put("preparationMoneyState", "1"); map.put("preparationMoneyState", "1");
if (Objects.nonNull(filters)) { if (Objects.nonNull(filters)) {
map.putAll(filters); map.putAll(filters);
map.put("regionalCompaniesSeq",filters.get("regionalcompaniesSeq"));
} }
return businessFieldMapper.getFhStationId(map); return businessFieldMapper.getFhStationId(map);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment