skyouc
2 天以前 51ea5c4baf680676ee6c00dbcbbee81b3ad32059
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
@@ -139,21 +139,24 @@
    public PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam, Map<String, Object> params) {
        List<Long> longs = new ArrayList<>();
        if (params.containsKey("groupId")) {
            Object groupId = params.get("groupId");
            MatnrGroup group = matnrGroupService.getById(groupId.toString());
            if (null != group){
                pageParam.getWhere().getMap().remove("groupId");
                if(!group.getCode().equals("01")){
                    List<MatnrGroup> matnrGroups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
                            .eq(MatnrGroup::getParentId, Long.parseLong(groupId.toString()))
                            .select(MatnrGroup::getId));
                    if (!matnrGroups.isEmpty()) {
                        longs = matnrGroups.stream().map(MatnrGroup::getId).collect(Collectors.toList());
            if (!Objects.isNull(params.get("groupId"))) {
                Object groupId = params.get("groupId");
                MatnrGroup group = matnrGroupService.getById(groupId.toString());
                if (null != group){
                    pageParam.getWhere().getMap().remove("groupId");
                    if(!group.getCode().equals("01")){
                        List<MatnrGroup> matnrGroups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
                                .eq(MatnrGroup::getParentId, Long.parseLong(groupId.toString()))
                                .select(MatnrGroup::getId));
                        if (!matnrGroups.isEmpty()) {
                            longs = matnrGroups.stream().map(MatnrGroup::getId).collect(Collectors.toList());
                        }
                        longs.add(group.getId());
                    }
                    longs.add(group.getId());
                }
            }
        }
        QueryWrapper<Matnr> queryWrapper = pageParam.buildWrapper(true);
        queryWrapper.in(!longs.isEmpty(),"group_id", longs);