From adcec30b5e03dd37ec6bb24eff9a23a0ee991d6d Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 23 May 2023 09:42:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9A=82=E6=8C=82=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/base/controller/BaseInvoiceController.java | 4 ++-- .../com/dxhy/core/service/export/impl/FpzhcxServiceImpl.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index 8a524706..6e36c958 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -1268,7 +1268,7 @@ public class BaseInvoiceController extends AbstractController { JSONObject jsonObject = new JSONObject(map); String uuids = jsonObject.getString("uuids"); - if (StringUtils.isEmpty(uuids)){ + if (StringUtils.isEmpty(uuids) ||(uuids.length() == 1 && uuids.contains(","))){ return ResponseEntity.ok(R.error("请先选择要暂挂的数据")); } String suspendType = jsonObject.getString("suspendType"); @@ -1292,7 +1292,7 @@ public class BaseInvoiceController extends AbstractController { Map pramsMap = new HashMap<>(); pramsMap.put("suspendType",suspendType); pramsMap.put("uuids",uuidList); - pramsMap.put("dbName",getUserInfo().getDbName()); +// pramsMap.put("dbName",getUserInfo().getDbName()); pramsMap.put("dbName","business"); try { diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxServiceImpl.java index 4b7a81e4..582472c5 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; import javax.annotation.Resource; +import javax.sound.sampled.DataLine; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; @@ -131,6 +132,7 @@ public class FpzhcxServiceImpl extends MpBaseServiceImpl{}", pageList); json.put("datalist", pageList); } }