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 71347bb3..881ce31f 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,10 +65,6 @@ 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", "")); @@ -223,11 +219,6 @@ 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 3ccec1f1..8ce721fb 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -69,14 +69,10 @@ like CONCAT('%',#{keyWord},'%') - - - and t.gf_tax_no in - - #{item} - - - + and t.gf_tax_no in + + #{item} + and t.invoice_type = #{invoiceType} @@ -222,13 +218,10 @@ like CONCAT('%',#{keyWord},'%') - - and t.gf_tax_no in - - #{item} - - - + and t.gf_tax_no in + + #{item} + and t.invoice_type = #{invoiceType} @@ -513,13 +506,10 @@ like CONCAT('%',#{keyWord},'%') - - and t.xf_tax_no in - - #{item} - - - + and t.xf_tax_no in + + #{item} + and t.invoice_type = #{invoiceType} @@ -627,13 +617,10 @@ like CONCAT('%',#{keyWord},'%') - - and t.xf_tax_no in - - #{item} - - - + and t.xf_tax_no in + + #{item} + and t.invoice_type = #{invoiceType}