Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

@@ -81,8 +81,10 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
         SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
         String orgLevelKey = data.getOrgLevelKey();
         if ("2".equals(orgLevelKey)) {
-            orgSidPath = orgSidPath.substring(0, 73);
-            qw.like("so.orgSidPath", orgSidPath);
+            String[] split = orgSidPath.split("/");
+            String s = split[0] + "/" + split[1];
+            //   orgSidPath = orgSidPath.substring(0, 73);
+            qw.like("so.orgSidPath", s);
         } else if ("3".equals(orgLevelKey)) {
             qw.eq("v.useOrgSid", query.getCreateOrgSid());
         }

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<SysOrganizationMa
         } else if ("3".equals(orgLevelKey) && orgPaths.size() >= Integer.parseInt(orgLevelKey)) {
             orgPath = orgPath.substring(0, i3);
         }
-        return rb.success().setMsg(orgPath);
+        return rb.success().setData(orgPath);
     }
 }

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());