Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1904,8 +1904,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 vo.setTopName("无");
                 vo.setMain(true);
             }
-            //挂车状态
-            vo.setTrailerInfoState(0);
             //价格信息
             //查询是否有价格信息
             BusSalesOrderPriceDetailsVo priceDetailsVo = busSalesOrderPriceService.details(saleOrderSid);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerService.java

@@ -108,23 +108,27 @@ public class BusSalesOrderTrailerService extends MybatisBaseService<BusSalesOrde
 		List<BusSalesOrderTrailerDetailsVo> busSalesOrderTrailerDetailsVos = baseMapper.fetchAllByOrderSid(orderSid);
 		for (BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo : busSalesOrderTrailerDetailsVos) {
 			BusSalesOrderTrailer busSalesOrderTrailer = fetchBySid(busSalesOrderTrailerDetailsVo.getSid());
-			String certFile = busSalesOrderTrailer.getCertFile();
-			String[] certFiles = certFile.split(",");
+			List<BusSalesOrderTrailerFile> contractFiless = new ArrayList<>();
 			List<BusSalesOrderTrailerFile> certFiless = new ArrayList<>();
-			for (String file : certFiles) {
-				String url = fileUploadComponent.getUrlPrefix() + file;
-				BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile();
-				busSalesOrderTrailerFile.setUrl(url);
-				certFiless.add(busSalesOrderTrailerFile);
+			String certFile = busSalesOrderTrailer.getCertFile();
+			if (StringUtils.isNotBlank(certFile)){
+				String[] certFiles = certFile.split(",");
+				for (String file : certFiles) {
+					String url = fileUploadComponent.getUrlPrefix() + file;
+					BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile();
+					busSalesOrderTrailerFile.setUrl(url);
+					certFiless.add(busSalesOrderTrailerFile);
+				}
 			}
 			String contractFile = busSalesOrderTrailer.getContractFile();
-			String[] contractFiles = contractFile.split(",");
-			List<BusSalesOrderTrailerFile> contractFiless = new ArrayList<>();
-			for (String file : contractFiles) {
-				String url = fileUploadComponent.getUrlPrefix() + file;
-				BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile();
-				busSalesOrderTrailerFile.setUrl(url);
-				contractFiless.add(busSalesOrderTrailerFile);
+			if (StringUtils.isNotBlank(contractFile)){
+				String[] contractFiles = contractFile.split(",");
+				for (String file : contractFiles) {
+					String url = fileUploadComponent.getUrlPrefix() + file;
+					BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile();
+					busSalesOrderTrailerFile.setUrl(url);
+					contractFiless.add(busSalesOrderTrailerFile);
+				}
 			}
 			busSalesOrderTrailerDetailsVo.setCertFile(certFiless);
 			busSalesOrderTrailerDetailsVo.setContractFile(contractFiless);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDetailsVo.java

@@ -72,9 +72,11 @@ public class AppSalesOrderTrailerDetailsVo implements Vo {
     private List<String> contractFile = new ArrayList<>(); // 合同附件
     @ApiModelProperty("同车型合格证附件")
     private List<String> certFile = new ArrayList<>(); // 同车型合格证附件
-	@ApiModelProperty("序号")
-    private Integer sort; // 序号
 	@ApiModelProperty("0不过票，1过票")
     private Integer isCompPassTicket; // 0不过票，1过票
 
+    @ApiModelProperty("挂车标识")
+    private String trailerName;
+    @ApiModelProperty("合计")
+    private BigDecimal totalPrice;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/TrailerVo.java

@@ -1,9 +1,9 @@
 package com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer;
 
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountListVo;
 import com.yxt.common.core.vo.Vo;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -15,6 +15,6 @@ import java.util.List;
 public class TrailerVo implements Vo {
     private static final long serialVersionUID = -1835469698115349175L;
 
-    private String total;
+    private BigDecimal total;
     private List<AppSalesOrderTrailerDetailsVo> records;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -215,8 +215,6 @@ public class AppBusSalesOrderService {
         } else {
             return rb.setMsg(resultBean.getMsg());
         }
-
-
     }
 
     /**
@@ -952,6 +950,7 @@ public class AppBusSalesOrderService {
         TrailerVo trailerVo = new TrailerVo();
         List<BusSalesOrderTrailerDetailsVo> data = busSalesOrderTrailerFeign.fetchDetailsByOrderSid(orderSid).getData();
         List<AppSalesOrderTrailerDetailsVo> appSalesOrderTrailerDetailsVos = new ArrayList<>();
+        BigDecimal total = new BigDecimal("0");
         for (BusSalesOrderTrailerDetailsVo datum : data) {
             AppSalesOrderTrailerDetailsVo appSalesOrderTrailerDetailsVo = new AppSalesOrderTrailerDetailsVo();
             BeanUtil.copyProperties(datum,appSalesOrderTrailerDetailsVo,"contractFile","certFile");
@@ -968,9 +967,16 @@ public class AppBusSalesOrderService {
             appSalesOrderTrailerDetailsVo.setContractFile(contractFileString);
             appSalesOrderTrailerDetailsVo.setCertFile(certFileString);
             appSalesOrderTrailerDetailsVo.setAppearanceSizeLong("长" + appSalesOrderTrailerDetailsVo.getAppearanceSizeLong() + "m");
+            appSalesOrderTrailerDetailsVo.setTotalPrice(appSalesOrderTrailerDetailsVo.getSingleFinalPrice().multiply(new BigDecimal(appSalesOrderTrailerDetailsVo.getTrailerCount())));
+            total = total.add(appSalesOrderTrailerDetailsVo.getTotalPrice());
             appSalesOrderTrailerDetailsVos.add(appSalesOrderTrailerDetailsVo);
         }
-        tr
+        for (int i = 0; i < appSalesOrderTrailerDetailsVos.size(); i++) {
+            AppSalesOrderTrailerDetailsVo appSalesOrderTrailerDetailsVo = appSalesOrderTrailerDetailsVos.get(i);
+            appSalesOrderTrailerDetailsVo.setTrailerName("挂车" + (i + 1));
+        }
+        trailerVo.setRecords(appSalesOrderTrailerDetailsVos);
+        trailerVo.setTotal(total);
         return rb.success().setData(trailerVo);
     }
 

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java

@@ -57,6 +57,8 @@ public class AsServiceTypeVo implements Vo {
     private Integer sortNo;
     @ApiModelProperty("服务类别名称")
     private String serviceTypeName;
+    @ApiModelProperty("服务类别编码")
+    private String serviceTypeCode;
     @ApiModelProperty("提成比例")
     private BigDecimal percentageRate;
     @ApiModelProperty("提成金额")

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java

@@ -65,4 +65,10 @@ public interface AsServiceGroupMapper extends BaseMapper<AsServiceGroup> {
 	List<AsServiceGroupVo> selectListVo();
 
     List<AsServiceGroupListVo> getGroupList(@Param("useOrgSid") String useOrgSid);
+
+	@Select("select count(*) from as_service_group where groupName = #{groupName} and useOrgSid = #{useOrgSid}")
+    int checkByCodeAndUseOrgSid(@Param("groupName") String groupName,@Param("useOrgSid") String useOrgSid);
+
+	@Select("select count(*) from as_service_group where groupName = #{groupName} and useOrgSid = #{useOrgSid} and sid != #{dtoSid}")
+	int checkSidByCodeAndUseOrgSid(@Param("groupName") String groupName,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java

@@ -76,9 +76,7 @@ public class AsServiceGroupRest {
     @ApiOperation("新增或修改")
     @PostMapping("/save")
     public ResultBean save(@RequestBody AsServiceGroupDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-        asServiceGroupService.saveOrUpdateDto(dto);
-        return rb.success();
+        return asServiceGroupService.saveOrUpdateDto(dto);
     }
 
     @ApiOperation("根据sid批量删除")

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java

@@ -75,13 +75,15 @@ public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapp
 		}
 		String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
 		qw.eq("createOrgSid",createOrgSid);
+		qw.orderByAsc("sortNo");
 		IPage<AsServiceGroup> page = PagerUtil.queryToPage(pq);
 		IPage<AsServiceGroupVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<AsServiceGroupVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}
 
-	public void saveOrUpdateDto(AsServiceGroupDto dto){
+	public ResultBean saveOrUpdateDto(AsServiceGroupDto dto){
+		ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
 			String deptName = "";
@@ -112,10 +114,19 @@ public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapp
 					dto.setCreateOrgName(organizationResultBean.getData().getName());
 				}
 			}
-            this.insertByDto(dto);
-            return;
+			int i = baseMapper.checkByCodeAndUseOrgSid(dto.getGroupName(), dto.getUseOrgSid());
+			if (i > 0){
+				return rb.setMsg("编码已存在");
+			}
+			this.insertByDto(dto);
+			return rb.success();
         }
+		int i = baseMapper.checkSidByCodeAndUseOrgSid(dto.getGroupName(), dto.getUseOrgSid(),dtoSid);
+		if (i > 0){
+			return rb.setMsg("编码已存在");
+		}
 		this.updateByDto(dto);
+		return rb.success();
 	}
 
 	public void insertByDto(AsServiceGroupDto dto){

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectMapper.java

@@ -62,4 +62,10 @@ public interface AsServiceSubjectMapper extends BaseMapper<AsServiceSubject> {
 	
 	@Select("select * from as_service_subject")
 	List<AsServiceSubjectVo> selectListVo();
+
+	@Select("select count(*) from as_service_subject where subjectCode = #{subjectCode} and useOrgSid = #{useOrgSid}")
+	int checkByCodeAndUseOrgSid(@Param("subjectCode") String subjectCode,@Param("useOrgSid") String useOrgSid);
+
+	@Select("select count(*) from as_service_subject where subjectCode = #{subjectCode} and useOrgSid = #{useOrgSid} and sid != #{dtoSid}")
+	int checkSidByCodeAndUseOrgSid(@Param("subjectCode") String subjectCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java

@@ -71,9 +71,7 @@ public class AsServiceSubjectRest{
 	@ApiOperation("新增或修改")
 	@PostMapping("/save")
 	public ResultBean save(@RequestBody AsServiceSubjectDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		asServiceSubjectService.saveOrUpdateDto(dto);
-		return rb.success();
+		return asServiceSubjectService.saveOrUpdateDto(dto);
 	}
 
 	@ApiOperation("根据sid批量删除")

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java

@@ -78,13 +78,15 @@ public class AsServiceSubjectService extends MybatisBaseService<AsServiceSubject
 		}
 		String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
 		qw.eq("createOrgSid",createOrgSid);
+		qw.orderByAsc("sortNo");
 		IPage<AsServiceSubject> page = PagerUtil.queryToPage(pq);
 		IPage<AsServiceSubjectVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<AsServiceSubjectVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}
 	
-	public void saveOrUpdateDto(AsServiceSubjectDto dto){
+	public ResultBean saveOrUpdateDto(AsServiceSubjectDto dto){
+		ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
 			String deptName = "";
@@ -115,10 +117,19 @@ public class AsServiceSubjectService extends MybatisBaseService<AsServiceSubject
 					dto.setCreateOrgName(organizationResultBean.getData().getName());
 				}
 			}
-            this.insertByDto(dto);
-            return; 
-        } 
+			int i = baseMapper.checkByCodeAndUseOrgSid(dto.getSubjectCode(), dto.getUseOrgSid());
+			if (i > 0){
+				return rb.setMsg("编码已存在");
+			}
+			this.insertByDto(dto);
+			return rb.success();
+        }
+		int i = baseMapper.checkSidByCodeAndUseOrgSid(dto.getSubjectCode(), dto.getUseOrgSid(),dtoSid);
+		if (i > 0){
+			return rb.setMsg("编码已存在");
+		}
 		this.updateByDto(dto);
+		return rb.success();
 	}
 	
 	public void insertByDto(AsServiceSubjectDto dto){

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeMapper.java

@@ -62,4 +62,10 @@ public interface AsServiceTypeMapper extends BaseMapper<AsServiceType> {
 	
 	@Select("select * from as_service_type")
 	List<AsServiceTypeVo> selectListVo();
+
+	@Select("select count(*) from as_service_type where serviceTypeCode = #{serviceTypeCode} and useOrgSid = #{useOrgSid}")
+	int checkByCodeAndUseOrgSid(@Param("serviceTypeCode") String serviceTypeCode,@Param("useOrgSid") String useOrgSid);
+
+	@Select("select count(*) from as_service_type where serviceTypeCode = #{serviceTypeCode} and useOrgSid = #{useOrgSid} and sid != #{dtoSid}")
+	int checkSidByCodeAndUseOrgSid(@Param("serviceTypeCode") String serviceTypeCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeRest.java

@@ -70,9 +70,7 @@ public class AsServiceTypeRest{
 	@ApiOperation("新增或修改")
 	@PostMapping("/save")
 	public ResultBean save(@RequestBody AsServiceTypeDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		asServiceTypeService.saveOrUpdateDto(dto);
-		return rb.success();
+		return asServiceTypeService.saveOrUpdateDto(dto);
 	}
 
 	@ApiOperation("根据sid批量删除")

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java

@@ -78,13 +78,15 @@ public class AsServiceTypeService extends MybatisBaseService<AsServiceTypeMapper
 		}
         String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
         qw.eq("createOrgSid",createOrgSid);
+        qw.orderByAsc("sortNo");
         IPage<AsServiceType> page = PagerUtil.queryToPage(pq);
         IPage<AsServiceTypeVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<AsServiceTypeVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 
-    public void saveOrUpdateDto(AsServiceTypeDto dto) {
+    public ResultBean saveOrUpdateDto(AsServiceTypeDto dto) {
+        ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             String deptName = "";
@@ -115,10 +117,20 @@ public class AsServiceTypeService extends MybatisBaseService<AsServiceTypeMapper
                     dto.setCreateOrgName(organizationResultBean.getData().getName());
                 }
             }
+            String serviceTypeCode = dto.getServiceTypeCode();
+            int i = baseMapper.checkByCodeAndUseOrgSid(serviceTypeCode, dto.getUseOrgSid());
+            if (i > 0){
+                return rb.setMsg("编码已存在");
+            }
             this.insertByDto(dto);
-            return;
+            return rb.success();
+        }
+        int i = baseMapper.checkSidByCodeAndUseOrgSid(dto.getServiceTypeCode(), dto.getUseOrgSid(),dtoSid);
+        if (i > 0){
+            return rb.setMsg("编码已存在");
         }
         this.updateByDto(dto);
+        return rb.success();
     }
 
     public void insertByDto(AsServiceTypeDto dto) {

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoMapper.java

@@ -64,4 +64,10 @@ public interface BaseSupplierInfoMapper extends BaseMapper<BaseSupplierInfo> {
 
 	@Select("select * from base_supplier_info where createOrgSid = #{createOrgSid} and isDelete = '0'")
     List<BaseSupplierInfoChoice> choiceSupplierInfo(String createOrgSid);
+
+	@Select("select count(*) from base_supplier_info where supplierCode = #{supplierCode} and useOrgSid = #{useOrgSid} and isDelete = '0'")
+    int checkByCodeAndUseOrgSid(@Param("supplierCode") String supplierCode,@Param("useOrgSid") String useOrgSid);
+
+	@Select("select count(*) from base_supplier_info where supplierCode = #{supplierCode} and useOrgSid = #{useOrgSid} and isDelete = '0' and sid != #{dtoSid}")
+	int checkSidByCodeAndUseOrgSid(@Param("supplierCode") String supplierCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid);
 }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java

@@ -128,13 +128,21 @@ public class BaseSupplierInfoService extends MybatisBaseService<BaseSupplierInfo
 					dto.setCreateOrgName(organizationResultBean.getData().getName());
 				}
 			}
+			int i = baseMapper.checkByCodeAndUseOrgSid(dto.getSupplierCode(), dto.getUseOrgSid());
+			if (i > 0){
+				return rb.setMsg("编码已存在");
+			}
 			String sid = this.insertByDto(dto);
 			for (BaseSupplierBankDto baseSupplierBankDto : baseSupplierBankDtoList) {
 				baseSupplierBankDto.setSupplierSid(sid);
 				baseSupplierBankService.saveOrUpdateDto(baseSupplierBankDto);
 			}
 			return rb.success();
-        } 
+        }
+		int i = baseMapper.checkSidByCodeAndUseOrgSid(dto.getSupplierCode(), dto.getUseOrgSid(),dtoSid);
+		if (i > 0){
+			return rb.setMsg("编码已存在");
+		}
 		this.updateByDto(dto);
 		baseSupplierBankService.deleteBySupplierSid(dtoSid);
 		for (BaseSupplierBankDto baseSupplierBankDto : baseSupplierBankDtoList) {

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeDto.java

@@ -61,4 +61,6 @@ public class BaseSupplierTypeDto implements Dto {
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
 
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
 }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeMapper.java

@@ -58,9 +58,9 @@ public interface BaseSupplierTypeMapper extends BaseMapper<BaseSupplierType> {
 	@Select("select * from base_supplier_type")
 	List<BaseSupplierTypeVo> selectListVo();
 
-	@Select("SELECT COUNT(*) FROM base_supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND createOrgSid = #{createOrgSid}")
-    int checkSaveCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("createOrgSid") String createOrgSid);
+	@Select("SELECT COUNT(*) FROM base_supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND useOrgSid = #{useOrgSid}")
+    int checkSaveCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("useOrgSid") String useOrgSid);
 
-	@Select("SELECT COUNT(*) FROM base_supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND createOrgSid = #{createOrgSid} AND sid != #{dtoSid}")
-	int checkUpdateCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("createOrgSid") String createOrgSid,@Param("dtoSid") String dtoSid);
+	@Select("SELECT COUNT(*) FROM base_supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND useOrgSid = #{useOrgSid} AND sid != #{dtoSid}")
+	int checkUpdateCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid);
 }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java

@@ -28,14 +28,21 @@ package com.yxt.base.biz.base.basesuppliertype;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo;
+import com.yxt.base.feign.portal.sysstafforg.SysStaffOrgFeign;
 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;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * Project: yxt-base(仓储基础信息供应商) <br/>
  * File: BaseSupplierTypeService.java <br/>
@@ -51,7 +58,12 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class BaseSupplierTypeService extends MybatisBaseService<BaseSupplierTypeMapper, BaseSupplierType> {
-	
+
+	@Autowired
+	private SysOrganizationFeign sysOrganizationFeign;
+	@Autowired
+	private SysStaffOrgFeign sysStaffOrgFeign;
+
 	public PagerVo<BaseSupplierTypeVo> listPageVo(PagerQuery<BaseSupplierTypeQuery> pq) {
 		BaseSupplierTypeQuery query = pq.getParams();
 		QueryWrapper<BaseSupplierType> qw = new QueryWrapper<>();
@@ -64,17 +76,43 @@ public class BaseSupplierTypeService extends MybatisBaseService<BaseSupplierType
 	public ResultBean saveOrUpdateDto(BaseSupplierTypeDto dto){
 		ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
-		String supplierTypeCode = dto.getSupplierTypeCode();
-		String createOrgSid = dto.getCreateOrgSid();
 		if (StringUtils.isBlank(dtoSid)) {
-			int i = baseMapper.checkSaveCode(supplierTypeCode,createOrgSid);
+			String deptName = "";
+			String deptSid = "";
+			String createOrgSid = "";
+			String orgPath = dto.getOrgPath();
+			if (StringUtils.isNotBlank(orgPath)) {
+				List<String> split = Arrays.asList(orgPath.split("/"));
+				if (split.size() > 1) {
+					//获取本级sid获取本级部门信息
+					SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
+					SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+					deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
+					deptName = sysOrganization1.getName();
+					deptSid = sysOrganization1.getSid();
+				} else {
+					SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+					deptName = sysOrganization.getName();
+					deptName = sysOrganization.getName();
+					deptSid = sysOrganization.getSid();
+				}
+				dto.setUseOrgSid(deptSid);
+				createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+				//创建组织使用组织
+				ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
+				if (organizationResultBean.getData() != null) {
+					dto.setCreateOrgSid(createOrgSid);
+					dto.setCreateOrgName(organizationResultBean.getData().getName());
+				}
+			}
+			int i = baseMapper.checkSaveCode(dto.getSupplierTypeCode(),dto.getUseOrgSid());
 			if (i > 0){
 				return rb.setMsg("新增编码已存在，请重新输入");
 			}
 			this.insertByDto(dto);
             return rb.success();
         }
-		int i = baseMapper.checkUpdateCode(supplierTypeCode,createOrgSid,dtoSid);
+		int i = baseMapper.checkUpdateCode(dto.getSupplierTypeCode(),dto.getUseOrgSid(),dtoSid);
 		if (i > 0){
 			return rb.setMsg("修改编码已存在，请重新输入");
 		}

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java

@@ -54,6 +54,6 @@ public interface PmsSupplierTypeMapper extends BaseMapper<PmsSupplierType> {
     @Delete("delete from yxt_base.base_supplier_type where sid = #{sid}")
     void del(String sid);
 
-    @Select("select * from yxt_base.base_supplier_type where createOrgSid = #{createOrgSid}")
-    List<PmsSupplierTypeDown> selSupplierType(String createOrgSid);
+    @Select("select * from yxt_base.base_supplier_type where useOrgSid = #{useOrgSid}")
+    List<PmsSupplierTypeDown> selSupplierType(String useOrgSid);
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java

@@ -42,6 +42,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -86,12 +87,6 @@ public class PmsSupplierTypeService extends MybatisBaseService<PmsSupplierTypeMa
 
     public ResultBean saveOrUpdateDto(PmsSupplierTypeDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        String orgPath = dto.getOrgPath();
-        String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
-        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
-        dto.setCreateOrgSid(createOrgSid);
-        dto.setCreateOrgName(sysOrganizationVo.getName());
-        dto.setUseOrgSid(createOrgSid);
         BaseSupplierTypeDto baseSupplierTypeDto = new BaseSupplierTypeDto();
 		BeanUtil.copyProperties(dto,baseSupplierTypeDto);
         ResultBean resultBean = baseSupplierTypeFeign.save(baseSupplierTypeDto);
@@ -108,8 +103,20 @@ public class PmsSupplierTypeService extends MybatisBaseService<PmsSupplierTypeMa
     }
 
     public List<PmsSupplierTypeDown> selSupplierType(String orgPath) {
-        String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
-        List<PmsSupplierTypeDown> pmsSupplierTypeDowns = baseMapper.selSupplierType(createOrgSid);
+        String useOrgSid = "";
+        if (StringUtils.isNotBlank(orgPath)) {
+            List<String> split = Arrays.asList(orgPath.split("/"));
+            if (split.size() > 1) {
+                //获取本级sid获取本级部门信息
+                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
+                SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                useOrgSid = sysOrganization1.getSid();
+            } else {
+                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                useOrgSid = sysOrganization.getSid();
+            }
+        }
+        List<PmsSupplierTypeDown> pmsSupplierTypeDowns = baseMapper.selSupplierType(useOrgSid);
         return pmsSupplierTypeDowns;
     }
 }

yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoDto.java

@@ -117,6 +117,8 @@ public class BaseSupplierInfoDto implements Dto {
     private String createOrgName; // 创建组织名称
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
     @ApiModelProperty("开户行信息")
     private List<BaseSupplierBankDto> baseSupplierBankList = new ArrayList<>();
 }

yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierTypeDto.java

@@ -61,4 +61,6 @@ public class BaseSupplierTypeDto implements Dto {
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
 
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
 }