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


@@ -1,6 +1,7 @@


package com.kidgrow.oprationcenter.service.impl;




import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.kidgrow.common.constant.CommonConstant;


import com.kidgrow.common.model.PageResult;


import com.kidgrow.common.model.ResultBody;


import com.kidgrow.common.model.SysUser;


@@ -16,9 +17,11 @@


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;


import java.util.stream.Collectors;




/**


 * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>


@@ -42,9 +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());


        return PageResult.<SysProduct>builder().data(list).code(0).count(page.getTotal()).build();


    }


    /**


@@ -74,7 +80,9 @@


                        break;


                }


            }


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


    }