Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

20 小时以前 bd1d4feea4f9522c69ef4c0fd72b1221eae5201f

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java

@@ -114,12 +114,15 @@
            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());
                }


            }
        }