1

wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysStaffinfoRest.java

@@ -89,9 +89,9 @@ public class SysStaffinfoRest {
     }
 
     @ApiOperation("员工信息编辑初始化及详情")
-    @GetMapping("/fetchBySid/{sid}")
+    @GetMapping("/fetchBySid/{sid}/{orgSid}")
-    public ResultBean<SysStaffinfoDetailsVo> fetchBySid(@PathVariable("sid") String  sid) {
+    public ResultBean<SysStaffinfoDetailsVo> fetchBySid(@PathVariable("sid") String sid,@PathVariable("orgSid") String orgSid) {
-        return sysStaffinfoService.selectDetailsBySid(sid);
+        return sysStaffinfoService.selectDetailsBySid(sid,orgSid);
     }
     /**
      * 获取集团内全部员工姓名

wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillService.java

@@ -78,7 +78,7 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
 
 
     public ResultBean<String> 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);
     }

wms/src/main/java/com/yxt/wms/biz/func/sysstaffinfo/SysStaffinfoService.java

@@ -93,8 +93,8 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
      * @param sid 员工sid
      * @return
      */
-    public ResultBean<SysStaffinfoDetailsVo> selectDetailsBySid(String sid) {
+    public ResultBean<SysStaffinfoDetailsVo> selectDetailsBySid(String sid,String orgSid) {
-        return sysStaffinfoFeign.fetchBySid(sid);
+        return sysStaffinfoFeign.fetchBySid(sid,orgSid);
     }
 
     /**

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java

@@ -71,12 +71,12 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
         wmsAnsBillFeign.exportExcel(query);
     }
     public ResultBean<List<WarehouseAnsBillExcelVo>> 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<List<WarehouseAnsBillExcelVo>> 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);
     }

wms/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java

@@ -86,8 +86,8 @@ public interface SysStaffinfoFeign {
      * @return
      */
     @ApiOperation("员工信息编辑初始化及详情")
-    @GetMapping("/fetchBySid/{sid}")
+    @GetMapping("/fetchBySid/{sid}/{orgSid}")
-    public ResultBean<SysStaffinfoDetailsVo> fetchBySid(@PathVariable("sid") String sid);
+    public ResultBean<SysStaffinfoDetailsVo> fetchBySid(@PathVariable("sid") String sid,@PathVariable("orgSid") String orgSid);
 
     /**
      * 获取集团内全部员工姓名