forked from kidgrow-microservices-platform
blame | history | patch | commit | commitdiff | ignore whitespace
zhaoxiaohao
2020-11-03 1a39d6ffecc6b4949f06dd03a8f64df0de75851a 
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java


@@ -17,6 +17,7 @@


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;




import java.util.Arrays;


import java.util.Date;


import java.util.List;


import java.util.Map;


@@ -44,10 +45,12 @@


    @Override


    public PageResult<SysProduct> findList(Map<String, Object> params, SysUser sysUser){


        Page<SysProduct> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));


        Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser.getRoles());


        Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser);


        params.putAll(roleOrgMap);


        List<Long> longs = Arrays.asList(CommonConstant.PAY_USER_PRODUCT_ID, CommonConstant.REG_USER_PRODUCT_ID);


        params.put("idNotIn",longs);


        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());


//        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();


    }


    /**