From 1606d8fccf9a8745100152aa2395aa2c15e1b95b Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 22 Nov 2022 18:03:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scmvehiclereturn/ScmVehicleReturn.java    |  3 +++
 .../ScmVehicleReturnDetailsVo.java            |  3 +++
 .../scmvehiclereturn/ScmVehicleReturnDto.java |  3 +++
 .../ScmVehicleReturnService.java              | 19 +++++++++++--------
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java
index 9bd9f86e7e..f1a18911f6 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java
@@ -37,4 +37,7 @@ public class ScmVehicleReturn extends BaseEntity {
     private String instanceId;
 
     private String procDefId;
+
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
 }
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java
index 6a359ca86f..878b1ad8b6 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java
@@ -42,4 +42,7 @@ public class ScmVehicleReturnDetailsVo implements Vo {
     private String createOrgSid;
     @ApiModelProperty(value = "taskId")
     private String taskId;
+
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
 }
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java
index afd7252f69..22347b1848 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java
@@ -64,4 +64,7 @@ public class ScmVehicleReturnDto implements Dto {
     private String orgName;
     @ApiModelProperty(value = "分公司sid")
     private String createOrgSid;
+
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
index 6f27fa0888..13bd6c6359 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
@@ -97,6 +97,10 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
     @Transactional(rollbackFor = Exception.class)
     public ResultBean saveOrUpdateVehicleReturn(ScmVehicleReturnDto scmVehicleReturnDto) {
         ResultBean rb = ResultBean.fireFail();
+        ResultBean<SysUserInfoVo> sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(scmVehicleReturnDto.getCreateBySid());
+        //取组织架构的全路径sid
+        SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserInfoVoResultBean.getData().getStaffSid()).getData();
+        String orgSidPath = sysStaffOrg.getOrgSidPath();
         String sid = scmVehicleReturnDto.getSid();
         if (StringUtils.isBlank(sid)) {
             //新增
@@ -112,6 +116,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             scmVehicleReturn.setMoney(mo);
             scmVehicleReturn.setCreateBySid(scmVehicleReturnDto.getCreateBySid());
             scmVehicleReturn.setApplicationName(scmVehicleReturnDto.getName());
+            scmVehicleReturn.setOrgSidPath(orgSidPath);
             boolean isSave = save(scmVehicleReturn);
             if (!isSave) {
                 return rb.setMsg("保存失败");
@@ -139,6 +144,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             BigDecimal mo = new BigDecimal(money);
             scmVehicleReturn.setMoney(mo);
             scmVehicleReturn.setApplicationName(scmVehicleReturnDto.getName());
+            scmVehicleReturn.setOrgSidPath(orgSidPath);
             baseMapper.updateById(scmVehicleReturn);
             //查询details中是否有关于return的该条sid数据
             List<ScmVehicleReturnDetails> scmVehicleReturnDetailsList = scmVehicleReturnDetailsService.selectByReturnSid(sid);
@@ -201,10 +207,6 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         }
         Map<String, Object> variables = BeanUtil.beanToMap(scmVehicleReturnDto);
         variables.put("isLoan", new BigDecimal(scmVehicleReturnDto.getMoney()).compareTo(new BigDecimal("0")) > 0);
-        ResultBean<SysUserInfoVo> sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(scmVehicleReturnDto.getCreateBySid());
-        //取组织架构的全路径sid
-        SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserInfoVoResultBean.getData().getStaffSid()).getData();
-        String orgSidPath = sysStaffOrg.getOrgSidPath();
         /*if (Double.parseDouble(scmVehicleReturnDto.getMoney()) > 0) {
             variables.put("isLoan", true);
         } else {
@@ -220,7 +222,8 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             String businessSid = resultBean.getData().toString();
             BusinessVariables bv = new BusinessVariables();
             BeanUtil.copyProperties(scmVehicleReturnDto, bv);
-            bv.setOrgSidPath(orgSidPath);
+            ScmVehicleReturn scmVehicleReturn1 = fetchBySid(businessSid);
+            bv.setOrgSidPath(scmVehicleReturn1.getOrgSidPath());
             bv.setBusinessSid(businessSid);
             bv.setUserSid(scmVehicleReturnDto.getCreateBySid());
             variables.put("businessSid", businessSid);
@@ -254,18 +257,18 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             return resultBean1;
         }
-        return submitBusinessData(scmVehicleReturnDto, busSid, orgSidPath, variables);
+        return submitBusinessData(scmVehicleReturnDto, busSid, variables);
     }
 
     private synchronized ResultBean submitBusinessData(ScmVehicleReturnDto dto,
-                                                       String businessSid, String orgSidPath,
+                                                       String businessSid,
                                                        Map<String, Object> variables) {
         ScmVehicleReturnDto booad = baseMapper.getBySid(businessSid);
         List<ScmVehicleReturnDetailsDto> detailsList = dto.getDetailsList();
         String businessTaskid = booad.getTaskId();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(dto, bv);
-        bv.setOrgSidPath(orgSidPath);
+        bv.setOrgSidPath(booad.getOrgSidPath());
         bv.setBusinessSid(businessSid);
         bv.setUserSid(dto.getCreateBySid());
         variables.put("businessSid", businessSid);