guoyujia 1 天之前
父节点
当前提交
84fc61f13f

+ 2 - 2
src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkItemController.java

@@ -388,8 +388,8 @@ public class BizDayworkItemController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('business:dayworkItem:list')")
 //    @PreAuthorize("@ss.hasPermi('business:dayworkItem:list')")
     @GetMapping("/tonoverList")
     @GetMapping("/tonoverList")
     @Log(title = "查询周转记录", businessType = BusinessType.SELECT)
     @Log(title = "查询周转记录", businessType = BusinessType.SELECT)
-    public TableDataInfo tonoverList(BizDayworkItem bizDayworkItem) {
-
+    public TableDataInfo tonoverList(BizDayworkItem bizDayworkItem) throws NoSuchFieldException, IllegalAccessException {
+//       setTenantId(bizDayworkItem);
         List<BizDayworkItem> list = bizDayworkItemService.getList(bizDayworkItem);
         List<BizDayworkItem> list = bizDayworkItemService.getList(bizDayworkItem);
         //人员只能看到最近的一条报工记录中工序的报工
         //人员只能看到最近的一条报工记录中工序的报工
         List<BizDayworkItem> itemList = new ArrayList<>();
         List<BizDayworkItem> itemList = new ArrayList<>();

+ 3 - 1
src/main/java/cn/ezhizao/project/business/workshop/controller/BizWorkshopController.java

@@ -87,7 +87,9 @@ public class BizWorkshopController extends BaseController {
     @PostMapping("/getTreeData")
     @PostMapping("/getTreeData")
     @Log(title = "获取周转区树状结构", businessType = BusinessType.SELECT)
     @Log(title = "获取周转区树状结构", businessType = BusinessType.SELECT)
     public AjaxResult getTreeData () {
     public AjaxResult getTreeData () {
-        List<BizWorkshop> workshop = bizWorkshopService.list();
+        QueryWrapper<BizWorkshop> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("tenant_id", Long.parseLong(request.getHeader("tenantId")));
+        List<BizWorkshop> workshop = bizWorkshopService.list(queryWrapper);
         List<BizWorkshopTurnover> workshopTurnovers = iBizWorkshopTurnoverService.query().eq("status", 0).list();
         List<BizWorkshopTurnover> workshopTurnovers = iBizWorkshopTurnoverService.query().eq("status", 0).list();
         List<TreeSelectText> treeSelectTexts = workshop.stream().map(i -> {
         List<TreeSelectText> treeSelectTexts = workshop.stream().map(i -> {
             TreeSelectText item = new TreeSelectText(i);
             TreeSelectText item = new TreeSelectText(i);