Merge branch 'pay_master' into dev

bingbing

2020-10-26 34589cd092e0de8cfd704cd59608ed0f36f6093a

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java

@@ -47,6 +47,7 @@
        Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser.getRoles());
        params.putAll(roleOrgMap);
        List<SysProduct> list  =  baseMapper.findList(page, params);
        list=list.stream().filter(f->(!f.getId().equals(CommonConstant.PAY_USER_PRODUCT_ID)&&!f.getId().equals(CommonConstant.REG_USER_PRODUCT_ID))).collect(Collectors.toList());
        return PageResult.<SysProduct>builder().data(list).code(0).count(page.getTotal()).build();
    }
    /**
@@ -76,7 +77,7 @@
                        break;
                }
            }
            list=list.stream().filter(f->(f.getId()!= CommonConstant.PAY_USER_PRODUCT_ID&&f.getId()!= CommonConstant.REG_USER_PRODUCT_ID)).collect(Collectors.toList());
            list=list.stream().filter(f->(!f.getId().equals(CommonConstant.PAY_USER_PRODUCT_ID)&&!f.getId().equals(CommonConstant.REG_USER_PRODUCT_ID))).collect(Collectors.toList());
        }

        return PageResult.<ProductAllVo>builder().data(list).code(0).count(0L).build();