From 3ca287938e02837ef01ccd681bf0262fee2fb424 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 02 Dec 2020 17:42:43 +0800
Subject: [PATCH] 将固定套餐去除， 去除打印和debugger
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java
index f491673..afa10d7 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java
+++ b/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();
}
/**
@@ -57,6 +60,7 @@
*/
@Override
public PageResult<ProductAllVo> findAllList(Map<String, Object> params, SysUser sysUser){
+ params.put("idNotIn",Arrays.asList(CommonConstant.PAY_USER_PRODUCT_ID, CommonConstant.REG_USER_PRODUCT_ID));
List<ProductAllVo> list = baseMapper.findAllList(params);
if (list != null) {
for (int i = 0; i <list.size() ; i++) {
--
Gitblit v1.8.0