diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysStaffinfoRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysStaffinfoRest.java index 8d253f5..79b16a3 100644 --- a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysStaffinfoRest.java +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysStaffinfoRest.java @@ -89,9 +89,9 @@ public class SysStaffinfoRest { } @ApiOperation("员工信息编辑初始化及详情") - @GetMapping("/fetchBySid/{sid}") - public ResultBean fetchBySid(@PathVariable("sid") String sid) { - return sysStaffinfoService.selectDetailsBySid(sid); + @GetMapping("/fetchBySid/{sid}/{orgSid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid,@PathVariable("orgSid") String orgSid) { + return sysStaffinfoService.selectDetailsBySid(sid,orgSid); } /** * 获取集团内全部员工姓名 diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillService.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillService.java index c1fe911..90e3b80 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillService.java @@ -78,7 +78,7 @@ public class PurchaseInventoryBillService extends MybatisBaseService confirm(PurchaseInventoryBillDto2 dto) { - SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(dto.getUserSid()).getData(); + SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(dto.getUserSid(),"").getData(); dto.setUserName(sysStaffinfoDetailsVo.getName()); return purchaseInventoryBillFeign.confirm(dto); } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/sysstaffinfo/SysStaffinfoService.java b/wms/src/main/java/com/yxt/wms/biz/func/sysstaffinfo/SysStaffinfoService.java index fd23fc1..140483b 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/sysstaffinfo/SysStaffinfoService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/sysstaffinfo/SysStaffinfoService.java @@ -93,8 +93,8 @@ public class SysStaffinfoService extends MybatisBaseService selectDetailsBySid(String sid) { - return sysStaffinfoFeign.fetchBySid(sid); + public ResultBean selectDetailsBySid(String sid,String orgSid) { + return sysStaffinfoFeign.fetchBySid(sid,orgSid); } /** diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java index 5b7529e..84223c4 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java @@ -71,12 +71,12 @@ public class WarehouseAnsBillService extends MybatisBaseService> updateRack(WarehouseAnsBillDto dto) { - SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(dto.getUserSid()).getData(); + SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(dto.getUserSid(),"").getData(); dto.setUserName(sysStaffinfoDetailsVo.getName()); return wmsAnsBillFeign.updateRack(dto); } public ResultBean> updateRemarks(WarehouseAnsBillDto dto) { - SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(dto.getUserSid()).getData(); + SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(dto.getUserSid(),"").getData(); dto.setUserName(sysStaffinfoDetailsVo.getName()); return wmsAnsBillFeign.updateRemarks(dto); } diff --git a/wms/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java b/wms/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java index f2ffa2f..ffad39b 100644 --- a/wms/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java +++ b/wms/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java @@ -86,8 +86,8 @@ public interface SysStaffinfoFeign { * @return */ @ApiOperation("员工信息编辑初始化及详情") - @GetMapping("/fetchBySid/{sid}") - public ResultBean fetchBySid(@PathVariable("sid") String sid); + @GetMapping("/fetchBySid/{sid}/{orgSid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid,@PathVariable("orgSid") String orgSid); /** * 获取集团内全部员工姓名