Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

longyvfengyun

2022-07-27 d90f0e1d65c60d5d8f382595cc2b51e36ba26546

 src/main/java/com/whyc/service/WorksheetMainService.java

@@ -243,6 +243,10 @@
        QueryWrapper<WorksheetMain> query = Wrappers.query();
        query.eq("create_user_id",user.getId()).in("status",1,2);
        List<WorksheetMain> worksheetMainList = mainMapper.selectList(query);
        //查询主表状态对应的子表
        worksheetMainList.forEach(main -> {
            main.setApprovingUser(linkService.getApprovingUser(main.getId()));
        });
        PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList);
        return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo);
    }