diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
index 881ce31f..71347bb3 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
@@ -65,6 +65,10 @@ public class ExtInvoicePoolController extends AbstractController {
// return ResponseEntity.ok(R.ok().put("data", ""));
// }
// }
+ String gfsh = (String)pramsMap.get("gfsh");
+ if (!org.apache.commons.lang.StringUtils.isNotBlank(gfsh)){
+ pramsMap.put("sign","88");
+ }
gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
if (gfshList.size() == 0) {
return ResponseEntity.ok(R.ok().put("data", ""));
@@ -219,6 +223,11 @@ public class ExtInvoicePoolController extends AbstractController {
// return ResponseEntity.ok(R.ok().put("data", ""));
// }
// }
+ String gfsh = (String)pramsMap.get("gfsh");
+ if (!org.apache.commons.lang.StringUtils.isNotBlank(gfsh)){
+ pramsMap.put("sign","88");
+ }
+
gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
if (gfshList.size() == 0) {
return ResponseEntity.ok(R.ok().put("data", ""));
diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
index 8ce721fb..3ccec1f1 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
@@ -69,10 +69,14 @@
like
CONCAT('%',#{keyWord},'%')
- and t.gf_tax_no in
-
- #{item}
-
+
+
+ and t.gf_tax_no in
+
+ #{item}
+
+
+
and t.invoice_type = #{invoiceType}
@@ -218,10 +222,13 @@
like
CONCAT('%',#{keyWord},'%')
- and t.gf_tax_no in
-
- #{item}
-
+
+ and t.gf_tax_no in
+
+ #{item}
+
+
+
and t.invoice_type = #{invoiceType}
@@ -506,10 +513,13 @@
like
CONCAT('%',#{keyWord},'%')
- and t.xf_tax_no in
-
- #{item}
-
+
+ and t.xf_tax_no in
+
+ #{item}
+
+
+
and t.invoice_type = #{invoiceType}
@@ -617,10 +627,13 @@
like
CONCAT('%',#{keyWord},'%')
- and t.xf_tax_no in
-
- #{item}
-
+
+ and t.xf_tax_no in
+
+ #{item}
+
+
+
and t.invoice_type = #{invoiceType}