From 92838820c9e49d4ccba368c192ce9567a550387e Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 25 Jul 2023 20:03:31 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0gfsh=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExtInvoicePoolController.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) 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 74208fa1..75033660 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 @@ -57,15 +57,15 @@ public class ExtInvoicePoolController extends AbstractController { pramsMap.put("dbName", getUserInfo().getDbName()); List gfshList = new ArrayList<>(); -// if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) { -// gfshList.add(pramsMap.get("gfsh").toString()); -// } else { -// gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); -// if (gfshList.size() == 0) { -// return ResponseEntity.ok(R.ok().put("data", "")); -// } -// } - gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); + if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) { + gfshList.add(pramsMap.get("gfsh").toString()); + } else { + gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); + if (gfshList.size() == 0) { + return ResponseEntity.ok(R.ok().put("data", "")); + } + } +// gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); boolean flag = checkList(gfshList); if (flag){ pramsMap.put("sign","88"); @@ -230,16 +230,16 @@ public class ExtInvoicePoolController extends AbstractController { pramsMap.put("dbName", getUserInfo().getDbName()); List gfshList = new ArrayList<>(); -// if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) { -// gfshList.add(pramsMap.get("gfsh").toString()); -// } else { -// gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); -// if (gfshList.size() == 0) { -// return ResponseEntity.ok(R.ok().put("data", "")); -// } -// } + if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) { + gfshList.add(pramsMap.get("gfsh").toString()); + } else { + gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); + if (gfshList.size() == 0) { + return ResponseEntity.ok(R.ok().put("data", "")); + } + } - gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); +// gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); boolean flag = checkList(gfshList); if (flag){ pramsMap.put("sign","88");