From 87bb35c89a8c4469b94783eabac74f9097fc1cc1 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 10 May 2024 16:26:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/databases/yxt-as.sql                         |  1 -
 .../AsBusclaimInvoiceBillService.java            | 16 +++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/doc/databases/yxt-as.sql b/doc/databases/yxt-as.sql
index 11ea45d41f..ba98d2c103 100644
--- a/doc/databases/yxt-as.sql
+++ b/doc/databases/yxt-as.sql
@@ -176,7 +176,6 @@ CREATE TABLE `as_busclaim_invoice_bill`
     `createOrgSid`   varchar(64)          DEFAULT NULL COMMENT '创建组织sid',
     `useOrgSid`      varchar(64)          DEFAULT NULL COMMENT '使用组织sid',
     `useOrgName`     varchar(64)          DEFAULT NULL COMMENT '分公司',
-    `orgSidPath`     text                 DEFAULT NULL COMMENT '组织全路径sid',
     `closeDate`      varchar(64)          DEFAULT NULL COMMENT '办结日期',
     `procInstId`     varchar(64)          DEFAULT NULL COMMENT '实例id',
     `procDefId`      varchar(64)          DEFAULT NULL COMMENT '流程定义id',
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java
index f8f90479af..3ee6621bf6 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java
@@ -24,6 +24,8 @@ import com.yxt.anrui.as.feign.flowable.flowtask.LatestTaskVo;
 import com.yxt.anrui.as.feign.message.MessageFeign;
 import com.yxt.anrui.as.feign.message.MessageFlowVo;
 import com.yxt.anrui.as.feign.message.MessageFlowableQuery;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -74,6 +76,9 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
     @Autowired
     private FlowableFeign flowableFeign;
 
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+
     public PagerVo<AsBusclaimInvoiceBillVo> listPage(PagerQuery<AsBusclaimInvoiceBillQuery> pagerQuery) {
         AsBusclaimInvoiceBillQuery query = pagerQuery.getParams();
         QueryWrapper<AsBusclaimInvoiceBill> qw = new QueryWrapper<>();
@@ -123,7 +128,6 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
         if (StringUtils.isBlank(sid)) {
             AsBusclaimInvoiceBill asBusclaimInvoiceBill = new AsBusclaimInvoiceBill();
             BeanUtil.copyProperties(dto, asBusclaimInvoiceBill, "sid");
-//            asBusclaimInvoiceBill.setOrgSidPath(dto.getOrgPath());
             asBusclaimInvoiceBill.setCreateBySid(dto.getCreateBySid());
             sid = asBusclaimInvoiceBill.getSid();
             List<String> fileList = dto.getFileList();
@@ -220,7 +224,10 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
         //用户的部门全路径sid
-//        bv.setOrgSidPath(asBusclaimInvoiceBill.getOrgSidPath());
+        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asBusclaimInvoiceBill.getCreateDeptSid()).getData();
+        if (sysOrganization != null) {
+            bv.setOrgSidPath(sysOrganization.getOrgSidPath());
+        }
         bv.setBusinessSid(businessSid);
         bv.setUserSid(dto.getCreateBySid());
         bv.setFormVariables(variables);
@@ -309,7 +316,10 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
         bv.setFormVariables(variables);
-//        bv.setOrgSidPath(asBusclaimInvoiceBill.getOrgSidPath());
+        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asBusclaimInvoiceBill.getCreateDeptSid()).getData();
+        if (sysOrganization != null) {
+            bv.setOrgSidPath(sysOrganization.getOrgSidPath());
+        }
         bv.setModelId(asBusclaimInvoiceBill.getProcDefId());
         if (bv.getTaskId().equals(asBusclaimInvoiceBill.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);