Merge remote-tracking branch 'origin/master'

src/main/java/com/yxt/supplier/apiadmin/SupplierTypeRest.java

@@ -94,7 +94,7 @@ public class SupplierTypeRest {
 	}
 	@ApiOperation("根据SID获取一条记录")
 	@GetMapping("/checkUpdateCode/{supplierTypeCode}/{useOrgSid}/{dtoSid}")
-	public ResultBean<Integer> checkUpdateCode(@PathVariable("supplierTypeCode") String supplierTypeCode,@PathVariable("useOrgSid") String useOrgSid,@PathVariable("orgSid")String dtoSid){
+	public ResultBean<Integer> checkUpdateCode(@PathVariable("supplierTypeCode") String supplierTypeCode,@PathVariable("useOrgSid") String useOrgSid,@PathVariable("dtoSid")String dtoSid){
 		return supplierTypeService.checkUpdateCode(supplierTypeCode,useOrgSid,dtoSid);
 	}
 

src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfo.java

@@ -108,5 +108,5 @@ public class SupplierInfo extends BaseEntity {
     private String createOrgName; // 创建组织名称
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-
+    private double taxRate;
 }

src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoDetailsVo.java

@@ -115,4 +115,6 @@ public class SupplierInfoDetailsVo implements Vo {
     private List<SupplierBankDetailsVo> baseSupplierBankList;
     private String userSid;
     private String orgPath;
+    private double taxRate;
+    private String remarks;
 }

src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoDto.java

@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.awt.*;
 import java.util.List;
 
 /**
@@ -115,4 +116,7 @@ public class SupplierInfoDto implements Dto {
     private List<SupplierBankDto> baseSupplierBankList;
     private String userSid;
     private String orgPath;
+    private double taxRate;
+    private String remarks;
+    private String orgSid;
 }

src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoVo.java

@@ -66,4 +66,6 @@ public class SupplierInfoVo implements Vo {
     private String createOrgSid;//创建组织sid
     private String userSid;
     private String orgPath;
+    private double taxRate;
+    private String remarks;
 }

src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java

@@ -64,6 +64,6 @@ public interface SupplierTypeMapper extends BaseMapper<SupplierType> {
 	@Select("SELECT COUNT(*) FROM 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);
 
-	@Select("select * from supplier_type a LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid where s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete = '0'")
+	@Select("select * from supplier_type a LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid where s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete = '0' and a.isEnable='1'")
 	List<SupplierTypeDown> selSupplierType(String useOrgSid);
 }