From e4b6fa8c6de6491c9d9ac546a553e14169ba5724 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 12 May 2023 18:05:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portal/biz/sysorganization/SysOrganizationService.java | 2 +- .../terminal/biz/autoservice/invoiced/InvoicedService.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index f931082636..cf4b68a885 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java @@ -682,6 +682,6 @@ public class SysOrganizationService extends MybatisBaseService= Integer.parseInt(orgLevelKey)) { orgPath = orgPath.substring(0, i3); } - return rb.success().setMsg(orgPath); + return rb.success().setData(orgPath); } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index e3c1e3c8fa..face889111 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -199,9 +199,9 @@ public class InvoicedService { finBillApplicationDto.setTotalBillMoney(dto.getInvoiceTotal()); finBillApplicationDto.setOrgSidPath(dto.getOrgPath()); finBillApplicationDto.setSaleTypeValue(dto.getSaleType()); - finBillApplicationDto.setSaleDeptName(dto.getSellerName()); + finBillApplicationDto.setSaleDeptName(dto.getSellerDept()); finBillApplicationDto.setStaffName(dto.getSellerName()); - finBillApplicationDto.setOpenTickUnitName(dto.getOpenTickName()); + finBillApplicationDto.setOpenTickUnitName(dto.getInvoicingUnit()); finBillApplicationDto.setCustomerName(dto.getName()); finBillApplicationDto.setOneBillMoney(dto.getInvoiceMoney()); finBillApplicationDto.setOpenTickTypeKey(dto.getOpenTickTypeKey());