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 b1e8b840..331568f8 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 @@ -935,7 +935,7 @@ public class BaseInvoiceController extends AbstractController { String companyCode = (String) map.get("companyCode"); String gfsh = (String)map.get("gfsh"); List gfshList = new ArrayList<>(); - if(StringUtils.isBlank(gfsh) && "99".equals(gfsh)){ + if(StringUtils.isNotBlank(gfsh) && "99".equals(gfsh)){ gfshList=UserInfoUtil.getGfshAll(getUserInfo().getOrg()); }else { gfshList.add(gfsh); @@ -963,7 +963,7 @@ public class BaseInvoiceController extends AbstractController { // // map.put("gfsh",gfshList); // -// map.put("sign","88"); + map.put("sign","99"); if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){ map.put("companyCodes",getUserInfo().getCompanyCodes()); @@ -974,8 +974,10 @@ public class BaseInvoiceController extends AbstractController { map.put("companyCode",companyCode); } String sgrzzngxcx = baseInvoiceManualCheckService.inTellingCheck(map); + log.info("sgrzzngxcx{}",sgrzzngxcx); BaseReturnData baseReturnData = JSON.parseObject(sgrzzngxcx, BaseReturnData.class); String encode = Base64.decodeStr(baseReturnData.getData()); + log.info("encode{}",encode); BaseReturnEntity baseReturnEntity = JSON.parseObject(encode, BaseReturnEntity.class); List dataList = baseReturnEntity.getDataList(); StringBuilder uuids = new StringBuilder();