From 70df3b57d2cb3601369387512f8c380dc928b457 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 29 Aug 2023 19:24:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=BB=93=E6=9E=9C=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=87=BA=E6=95=B0=E9=87=8F=E4=B8=8D=E5=AF=B9?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml | 2 +- .../java/com/dxhy/extend/controller/ExtFpzhcxController.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml b/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml index f3ab62c4..a27326f0 100644 --- a/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml +++ b/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml @@ -35,7 +35,7 @@ from t_dx_record_invoice t where t.invoice_type in ('01','03','08','14','31') and t.auth_status = '4' and t.gf_tax_no = #{gfsh} - and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null) + and t.comp_code = #{companyCode} and t.rzh_belong_date = #{skssq} diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java index f35edc17..7d8cdfd2 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java @@ -376,6 +376,11 @@ public class ExtFpzhcxController extends AbstractController { data.put("dbName", getUserInfo().getDbName()); data.put("gfsh", pramsMap.get("gfsh").toString()); + + if (StringUtils.isBlank((String) pramsMap.get("companyCode"))){ + return ResponseEntity.ok(R.error("组织编码不能为空")); + } + data.put("companyCode",pramsMap.get("companyCode")); if (pramsMap.get("yczt") != null && !"".equals(pramsMap.get("yczt")) && !"99".equals(pramsMap.get("yczt"))) { data.put("yczt", pramsMap.get("yczt")); }