From 89d6c9b49dc3cfa29cd42438e4f6ed29f5a274d8 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 9 Aug 2024 17:46:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinfo/SupplierInfoService.java     | 19 +++++++++----------
 .../biz/func/sysuserrole/SysUserRoleDto.java  |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoService.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoService.java
index 30ffe61..ba4ca9f 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoService.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoService.java
@@ -41,38 +41,37 @@ import java.util.List;
 public class SupplierInfoService {
 
 	@Autowired
-	SupplierInfoFeign baseSupplierInfoFeign;
+	SupplierInfoFeign supplierInfoFeign;
+
 	@Autowired
-	SupplierInfoFeign baseSupplierInfoFeign;
+	WarehouseAnsBillFeign warehouseAnsBillFeign;
 	@Autowired
 	CommonMethod commonMethod;
-	@Autowired
-	WarehouseAnsBillFeign warehouseAnsBillFeign;
 	public ResultBean<PagerVo<SupplierInfoVo>> listPageVo(PagerQuery<SupplierInfoQuery> pq) {
 		SupplierInfoQuery query = pq.getParams();
 		DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();
 		pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
 		pq.getParams().setIndex(dataRule.getIndex());
-		return baseSupplierInfoFeign.listPage(pq);
+		return supplierInfoFeign.listPage(pq);
 	}
 
 	public ResultBean saveOrUpdateDto(SupplierInfoDto dto){
-		return baseSupplierInfoFeign.save(dto);
+		return supplierInfoFeign.save(dto);
 	}
 
 	public ResultBean<SupplierInfoDetailsVo> fetchDetailsVoBySid(String sid){
-		return baseSupplierInfoFeign.fetchDetailsBySid(sid);
+		return supplierInfoFeign.fetchDetailsBySid(sid);
 	}
 	public ResultBean<SupplierInfoDetailsVo> fetchDetailsByBillSid(String sid){
 		WarehouseAnsDetailsVo warehouseAnsDetailsVo=warehouseAnsBillFeign.details(sid).getData();
-		return baseSupplierInfoFeign.fetchDetailsBySid(warehouseAnsDetailsVo.getSupplierSid());
+		return supplierInfoFeign.fetchDetailsBySid(warehouseAnsDetailsVo.getSupplierSid());
 	}
 
 	public void delAll(String[] sids) {
-		baseSupplierInfoFeign.delBySids(sids);
+		supplierInfoFeign.delBySids(sids);
 	}
 
 	public ResultBean<List<SupplierInfoChoice>> choiceSupplierInfo(String createOrgSid) {
-		return baseSupplierInfoFeign.choiceSupplierInfo(createOrgSid);
+		return supplierInfoFeign.choiceSupplierInfo(createOrgSid);
 	}
 }
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleDto.java b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleDto.java
index bce8e54..4242928 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleDto.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleDto.java
@@ -22,7 +22,7 @@ import lombok.Data;
 @ApiModel(value = "用户与角色关联表 数据传输对象", description = "用户与角色关联表 数据传输对象")
 @Data
 public class SysUserRoleDto implements Dto {
-
+    private String sid;
     
 	@ApiModelProperty("用户sid")
     private String userSid;