问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java

@@ -56,6 +56,7 @@ public interface BaseManufacturerFeign {
     @ResponseBody
     public ResultBean<PagerVo<BaseManufacturerVo>> gysPagerList(@RequestBody PagerQuery<BaseManufacturerQuery> pagerQuery);
 
+
     /**
      * 新增保存
      *
@@ -102,6 +103,28 @@ public interface BaseManufacturerFeign {
     @ResponseBody
     public ResultBean<BaseManufacturerAllVo> details(@PathVariable("sid") String sid);
 
+    /**
+     * 外采供应商名称下拉选
+     *
+     * @param orgSid 分公司sid
+     * @return
+     */
+    @ApiOperation("外采供应商名称下拉选")
+    @GetMapping("/wcgysNamesDown/{orgSid}")
+    @ResponseBody
+    public ResultBean<List<Map<String, String>>> wcgysNamesDown(@PathVariable("orgSid") String orgSid);
+
+    /**
+     * 开户行信息下拉选
+     *
+     * @param manufacturerSid 厂商sid
+     * @return
+     */
+    @ApiOperation("开户行信息下拉选")
+    @GetMapping("/bankNamesDown/{manufacturerSid}")
+    @ResponseBody
+    public ResultBean<List<Map<String, String>>> bankNamesDown(@PathVariable("manufacturerSid") String manufacturerSid);
+
     /**
      * 导出供应厂商信息
      *

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java

@@ -56,6 +56,16 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
         return new ResultBean<BaseManufacturerAllVo>().fail().setMsg("接口anrui-base/basemanufacturer/details无法访问");
     }
 
+    @Override
+    public ResultBean<List<Map<String, String>>> wcgysNamesDown(String orgSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<Map<String, String>>> bankNamesDown(String manufacturerSid) {
+        return null;
+    }
+
     @Override
     public void exportExcel(BaseManufacturerExportQuery query) {
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java

@@ -36,6 +36,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -72,21 +73,29 @@ public class BaseOutsourcingApplicationDto implements Dto {
     private String externalMiningTypeKey; // 外采类型key
 	@ApiModelProperty("外采类型value")
     private String externalMiningTypeValue; // 外采类型value
-	@ApiModelProperty("采购单位sid")
+	@ApiModelProperty("外采供应商sid")
-    private String purchasingUnitSid; // 采购单位sid
+	@NotBlank(message = "外采供应商不能为空")
-	@ApiModelProperty("采购单位名称")
+    private String purchasingUnitSid; // 外采供应商sid
-    private String purchasingUnitName; // 采购单位名称
+	@ApiModelProperty("外采供应商名称")
+	@NotBlank(message = "外采供应商不能为空")
+    private String purchasingUnitName; // 外采供应商名称
 	@ApiModelProperty("车型sid")
+	@NotBlank(message = "车型不能为空")
     private String modelSid; // 车型sid
 	@ApiModelProperty("车型名称")
+	@NotBlank(message = "车型不能为空")
     private String modelName; // 车型名称
 	@ApiModelProperty("常用配置sid")
+	@NotBlank(message = "常用配置不能为空")
 	private String configSid; // 常用配置sid
 	@ApiModelProperty("常用配置名称")
+	@NotBlank(message = "常用配置不能为空")
     private String configName; // 常用配置名称
 	@ApiModelProperty("采购价格")
+	@NotBlank(message = "采购价格不能为空")
     private BigDecimal purchasePrice; // 采购价格
 	@ApiModelProperty("销售指导价")
+	@NotBlank(message = "销售指导价不能为空")
     private BigDecimal guidedPrice; // 销售指导价
 	@ApiModelProperty("厂家合同价")
     private BigDecimal manufactorSettlementPrice; // 厂家合同价
@@ -100,8 +109,9 @@ public class BaseOutsourcingApplicationDto implements Dto {
 	private String depositBankName; // 车款开户银行
 	@ApiModelProperty("车款银行账号")
 	private String bankAccount; // 车款银行账号
-	@ApiModelProperty("车款收款账户名称")
+	@ApiModelProperty("车款账户名称")
-	private String accountName; // 车款收款账户名称
+	@NotBlank(message = "车款账户名称不能为空")
+	private String accountName; // 车款账户名称
 	@ApiModelProperty("台数")
     private Integer num; // 台数
 	@ApiModelProperty("订金")
@@ -131,6 +141,7 @@ public class BaseOutsourcingApplicationDto implements Dto {
 	@ApiModelProperty("备注")
 	private String remarks; // 备注
 	@ApiModelProperty("内部编码")
+	@NotBlank(message = "内部编码不能为空")
 	private String insideCode; // 内部编码
 	@ApiModelProperty("是否先付款")
 	private String isBeforePayment; // 是否先付款

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java

@@ -113,4 +113,5 @@ public interface BaseVehicleBrandFeign {
     @GetMapping("/selectAppListByUserSid/{userSid}")
     ResultBean<List<BaseVehicleBrandDictionariesVo>> selectAppListByUserSid(@PathVariable("userSid") String userSid);
 
+    BaseVehicleBrand fetchBySid(String sid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java

@@ -81,5 +81,10 @@ public class BaseVehicleBrandFeignFallback implements BaseVehicleBrandFeign {
         return null;
     }
 
+    @Override
+    public BaseVehicleBrand fetchBySid(String sid) {
+        return null;
+    }
+
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificate.java

@@ -54,6 +54,12 @@ public class BaseVehicleCertificate extends BaseEntity {
     @ApiModelProperty("到证日期（陕汽必须字段）")
     private Date toCardDate;
 
+    @ApiModelProperty("接收日期")
+    private Date acceptDate;
+
+    @ApiModelProperty("接收人")
+    private String acceptName;
+
     @ApiModelProperty("领取日期（陕汽必须字段）")
     private Date receiveDate;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDetailsVo.java

@@ -52,6 +52,13 @@ public class BaseVehicleCertificateDetailsVo implements Vo {
     @ApiModelProperty("领取人（陕汽必须字段）")
     private String receiver;
 
+    @ApiModelProperty("接收日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date acceptDate;
+
+    @ApiModelProperty("接收人")
+    private String acceptName;
+
     @ApiModelProperty("合格证照片（陕汽必须字段）")
     private List<String> certificatePhoto;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDto.java

@@ -55,6 +55,13 @@ public class BaseVehicleCertificateDto implements Dto {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date toCardDate;
 
+    @ApiModelProperty("接收日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date acceptDate;
+
+    @ApiModelProperty("接收人")
+    private String acceptName;
+
     @ApiModelProperty("领取日期（陕汽必须字段）")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date receiveDate;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateVo.java

@@ -1,11 +1,13 @@
 package com.yxt.anrui.base.api.basevehiclecertificate;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -47,6 +49,12 @@ public class BaseVehicleCertificateVo implements Vo {
     @ApiModelProperty("到证日期")
     private String toCardDate;
 
+    @ApiModelProperty("接收日期")
+    private String acceptDate;
+
+    @ApiModelProperty("接收人")
+    private String acceptName;
+
     @ApiModelProperty("领取日期")
     private String receiveDate;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java

@@ -110,6 +110,16 @@ public interface BaseVehicleModelFeign {
     @GetMapping("/getAll/{sid}/{userSid}")
     public ResultBean<BaseVehicleModelSelectVo> getAll(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
 
+    /**
+     * 快速新增回显
+     *
+     * @param sid 车型sid
+     * @return
+     */
+    @ApiOperation("快速新增回显")
+    @GetMapping("/saveGetAll/{sid}/{userSid}")
+    public ResultBean<BaseVehicleModelSelectVo> saveGetAll(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
+
 
     /**
      * 车型列表导出

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java

@@ -66,6 +66,11 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<BaseVehicleModelSelectVo> saveGetAll(String sid, String userSid) {
+        return null;
+    }
+
     @Override
     public void exportExcel(BaseVehicleModelExportQuery query) {
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java

@@ -113,4 +113,8 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
      * @return
      */
     int updateBySidIsDelete(@Param("list") List<String> sids);
+
+    List<Map<String, String>> wcgysNamesDown(String orgSid);
+
+    List<Map<String, String>> bankNamesDown(String manufacturerSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@@ -24,14 +24,16 @@
     <select id="selectCountByName" resultType="int">
         SELECT count(*)
         FROM base_manufacturer
-        WHERE manufacturerName = #{name} and isDelete = 0
+        WHERE manufacturerName = #{name}
+          and isDelete = 0
     </select>
     <!--根据厂商名称和厂商sid查重-->
     <select id="selectCountByNameAndSid" resultType="int">
         SELECT count(*)
         FROM base_manufacturer
-        WHERE manufacturerName = #{name} AND isDelete = 0
+        WHERE manufacturerName = #{name}
-        AND sid &lt;&gt; #{sid}
+          AND isDelete = 0
+          AND sid &lt;&gt; #{sid}
     </select>
     <!--供应厂商详情以及修改回显-->
     <select id="selectDetailsBySid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerDetailsVo">
@@ -73,7 +75,7 @@
         bm.supplierGroup,
         bm.supplierGroupValue,
         <!--使用组织sid-->
-      <!--  bm.useOrg orgSidOne,-->
+        <!--  bm.useOrg orgSidOne,-->
         <!--使用组织名称-->
         bm.useOrgName,
         <!--国家-->
@@ -114,7 +116,7 @@
     <select id="selectByOrgSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufactureSelectVo">
         SELECT bm.manufacturerName, bm.sid
         FROM base_manufacturer bm
-            ${ew.customSqlSegment}
+                ${ew.customSqlSegment}
     </select>
 
     <select id="selectAppListByOrgSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAppSearchVo">
@@ -145,4 +147,20 @@
             #{item}
         </foreach>
     </update>
+
+    <select id="wcgysNamesDown" resultType="java.util.Map">
+        SELECT sid,
+               manufacturerName
+        FROM base_manufacturer
+        WHERE supplierType = "0004"
+          AND createOrg = #{orgSid}
+    </select>
+
+    <select id="bankNamesDown" resultType="java.util.Map">
+        SELECT accountName,
+               depositBank,
+               bankAccount
+        FROM base_manufacturer_bank
+        WHERE manufacturerSid = #{manufacturerSid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java

@@ -107,6 +107,16 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
         return baseManufacturerService.details(sid);
     }
 
+    @Override
+    public ResultBean<List<Map<String,String>>> wcgysNamesDown(String orgSid) {
+        return baseManufacturerService.wcgysNamesDown(orgSid);
+    }
+
+    @Override
+    public ResultBean<List<Map<String, String>>> bankNamesDown(String manufacturerSid) {
+        return baseManufacturerService.bankNamesDown(manufacturerSid);
+    }
+
     @Override
     public void exportExcel(BaseManufacturerExportQuery query) {
         //得到所有要导出的数据

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@@ -385,4 +385,16 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         //baseManufacturerFinanceService.updateBySid(dto.getBaseManufacturerFinanceDto().toMap(), baseManufacturerFinance.getSid());
         return rb.success().setMsg("修改成功");
     }
+
+    public ResultBean<List<Map<String,String>>> wcgysNamesDown(String orgSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<Map<String,String>> manufacturerNames = baseMapper.wcgysNamesDown(orgSid);
+        return rb.success().setData(manufacturerNames);
+    }
+
+    public ResultBean<List<Map<String, String>>> bankNamesDown(String manufacturerSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<Map<String,String>> bankNames = baseMapper.bankNamesDown(manufacturerSid);
+        return rb.success().setData(bankNames);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.java

@@ -69,4 +69,6 @@ public interface BaseOutsourcingApplicationMapper extends BaseMapper<BaseOutsour
     int selectNum(String bill);
 
     AppBaseOutsourcingApplicationVo getExternalPurchase(String sid);
+
+    int selectBySid(String join);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml

@@ -68,4 +68,11 @@
 		from base_outsourcing_application
 		where sid = #{sid}
     </select>
+
+	<select id="selectBySid" resultType="int">
+		SELECT COUNT(*)
+		FROM base_outsourcing_application
+		WHERE nodeState != '待提交'
+		  and find_in_set(sid, #{list})
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -264,6 +264,11 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 
     public ResultBean delAllBySids(String[] sids) {
         ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
+        }
         delBySids(sids);
         for (String sid : sids) {
             baseOutsourcingApplicationVehicleService.deleteByOutAppSid(sid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java

@@ -176,4 +176,9 @@ public class BaseVehicleBrandRest implements BaseVehicleBrandFeign {
         List<BaseVehicleBrandDictionariesVo> list = baseVehicleBrandService.selectAppListByUserSid(userSid);
         return  new ResultBean<List<BaseVehicleBrandDictionariesVo>>().success().setData(list);
     }
+
+    @Override
+    public BaseVehicleBrand fetchBySid(String sid) {
+        return baseVehicleBrandService.fetchBySid(sid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml

@@ -24,6 +24,10 @@
         DATE_FORMAT(bvc.receiveDate, '%Y-%m-%d') as receiveDate,
         <!--领取人-->
         bvc.receiver,
+        <!--接收日期-->
+        DATE_FORMAT(bvc.acceptDate, '%Y-%m-%d') as acceptDate,
+        <!--接收人-->
+        bvc.acceptName,
         <!--备注-->
         bvc.remarks,
         bvc.vinNo,
@@ -55,6 +59,10 @@
         bvc.receiveDate,
         <!--领取人-->
         bvc.receiver,
+        <!--接收日期-->
+        bvc.acceptDate,
+        <!--接收人-->
+        bvc.acceptName,
         <!--备注-->
         bvc.remarks
         FROM base_vehicle_certificate bvc
@@ -85,6 +93,10 @@
         DATE_FORMAT(bvc.receiveDate, '%Y-%m-%d') as receiveDate,
         <!--领取人-->
         bvc.receiver,
+        <!--接收日期-->
+        DATE_FORMAT(bvc.acceptDate, '%Y-%m-%d') as acceptDate,
+        <!--接收人-->
+        bvc.acceptName,
         <!--底盘ID-->
         bvc.chassisId,
         <!--转向类型-->

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java

@@ -204,6 +204,22 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
         return rb.success().setData(vo);
     }
 
+    @Override
+    public ResultBean<BaseVehicleModelSelectVo> saveGetAll(String sid, String userSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseVehicleModelSelectVo vo = baseVehicleModelService.getAll(sid);
+        if (vo == null) {
+            return rb.setMsg("该车型信息不存在");
+        }
+        ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
+        String sid1 = useOrgByUserSid.getData().getSid();
+        int i4 = baseVehicleModelService.checkByCreateOrgAndModelSid(sid1, sid);
+        if (i4 == 0) {
+            return rb.setMsg("该车型不属于当前分公司，无法修改");
+        }
+        return rb.success().setData(vo);
+    }
+
     @Override
     public void exportExcel(BaseVehicleModelExportQuery query) {
         //得到所有要导出的数据

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -95,6 +95,11 @@ public interface SysOrganizationFeign {
     @GetMapping("/getListOrg")
     ResultBean<List<SysOrgVo>> getListOrg();
 
+    @ApiOperation("获取同品牌下分公司")
+    @ResponseBody
+    @GetMapping("/getListOrgByBrand/{orgSid}")
+    ResultBean<List<SysOrgVo>> getListOrgByBrand(@PathVariable(value = "orgSid") String orgSid);
+
     @ApiOperation("根据业务员sid获取到分公司")
     @ResponseBody
     @GetMapping("/getUseOrgByUserSid")

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -103,6 +103,11 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<SysOrgVo>> getListOrgByBrand(String orgSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<SysOrganizationVo> getUseOrgByUserSid(String staffSid) {
         return null;

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java

@@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.anrui.portal"
 })
 @EnableDiscoveryClient
-@EnableFeignClients(basePackages = {"com.yxt.anrui.crm","com.yxt.anrui.flowable","com.yxt.messagecenter","com.yxt.anrui.terminal"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.crm","com.yxt.anrui.flowable","com.yxt.messagecenter","com.yxt.anrui.terminal","com.yxt.anrui.base"})
 public class PortalApplication {
 
     public static void main(String[] args) {

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@@ -102,4 +102,7 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     SysOrganizationVo getUseOrgByStaffSid(String sid);
 
     List<Map<String, String>> selectUseOrgSidBySid(String psid);
+
+    SysOrgVo getListOrgByBrand(String sid);
+
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@@ -166,4 +166,11 @@
           AND isDelete = 0
           AND isDept = 0
     </select>
+
+    <select id="getListOrgByBrand" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgVo">
+        SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
+        FROM sys_organization so
+        WHERE isDept = 0 AND so.sid = #{sid}
+        ORDER BY psid
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -207,6 +207,11 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         return rb.success().setData(menuTree2VoList);
     }
 
+    @Override
+    public ResultBean<List<SysOrgVo>> getListOrgByBrand(String orgSid) {
+        return sysOrganizationService.getListOrgByBrand(orgSid);
+    }
+
     @Override
     public ResultBean<SysOrganizationVo> getUseOrgByUserSid(String userSid) {
         ResultBean<SysOrganizationVo> rb = ResultBean.fireFail();

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -3,6 +3,10 @@ package com.yxt.anrui.portal.biz.sysorganization;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
+import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
+import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandSelectQuery;
+import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandSelectVo;
 import com.yxt.anrui.portal.api.sysorganization.*;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
@@ -12,6 +16,7 @@ import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +45,8 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
     private SysUserService sysUserService;
     @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private BaseVehicleBrandFeign baseVehicleBrandFeign;
 
     public PagerVo<SysOrganization> listPage(PagerQuery<SysOrganizationQuery> pq) {
         SysOrganizationQuery query = pq.getParams();
@@ -293,6 +300,34 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         return list;
     }
 
+    public ResultBean<List<SysOrgVo>> getListOrgByBrand(String orgSid) {
+        ResultBean<List<SysOrgVo>> rb = ResultBean.fireFail();
+        BaseVehicleBrandSelectQuery baseVehicleBrandSelectQuery = new BaseVehicleBrandSelectQuery();
+        baseVehicleBrandSelectQuery.setOrgSid(orgSid);
+        List<BaseVehicleBrandSelectVo> data = baseVehicleBrandFeign.selectByOrgSid(baseVehicleBrandSelectQuery).getData();
+        if (data.size() < 1) {
+            return rb.setMsg("该分公司未别品牌方授权");
+        }
+        List<String> orgSids = new ArrayList<>();
+        List<SysOrgVo> list = new ArrayList<>();
+        for (BaseVehicleBrandSelectVo datum : data) {
+            String sid = datum.getSid();
+            BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(sid);
+            String useOrg = baseVehicleBrand.getUseOrg();
+            if (StringUtils.isNotBlank(useOrg)) {
+                String[] orgSidss = useOrg.split(",");
+                for (String sidss : orgSidss) {
+                    if (!orgSids.contains(sidss)) {
+                        orgSids.add(sidss);
+                        SysOrgVo sysOrgVo = baseMapper.getListOrgByBrand(sidss);
+                        list.add(sysOrgVo);
+                    }
+                }
+            }
+        }
+        return rb.success().setData(list);
+    }
+
     public SysOrganization selectOrgCodeByPsid() {
         return baseMapper.selectOrgCodeByPsid();
     }