java/HongRuiTang.git

			@@ -31,6 +31,7 @@
			import javax.servlet.http.HttpServletResponse;
			import java.io.IOException;
			import java.io.PrintWriter;
			import java.rmi.server.ServerCloneException;
			import java.util.ArrayList;
			import java.util.List;
			import java.util.Map;
			@@ -93,7 +94,12 @@
			.in("belong_user_id", userIds)
			.eq("del_flag", 0))
			.stream().map(Shop::getShopId).collect(Collectors.toList());
			scope.addAll(data);
			if (data.size()==0){
			scope.add(0L);
			}else{
			scope.addAll(data);
			}

			break;
			case "5":
			// 仅个人数据查询当前登陆人关联店铺下的用户
			@@ -104,7 +110,11 @@
			.in("belong_user_id", longs)
			.eq("del_flag", 0))
			.stream().map(Shop::getShopId).collect(Collectors.toList());
			scope.addAll(data1);
			if (data1.size()==0){
			scope.add(0L);
			}else{
			scope.addAll(data1);
			}
			break;
			}
			}
			@@ -135,7 +145,12 @@
			.in("belong_user_id", userIds)
			.eq("del_flag", 0))
			.stream().map(Shop::getShopId).collect(Collectors.toList());
			scope.addAll(data);
			if (data.size()==0){
			scope.add(0L);
			}else{
			scope.addAll(data);
			}

			break;
			case "5":
			// 仅个人数据查询当前登陆人关联店铺下的用户
			@@ -146,12 +161,23 @@
			.in("belong_user_id", longs)
			.eq("del_flag", 0))
			.stream().map(Shop::getShopId).collect(Collectors.toList());
			scope.addAll(data1);
			if (data1.size()==0){
			scope.add(0L);
			}else{
			scope.addAll(data1);
			}
			break;
			}
			}
			}
			}
			if(null != mgtShopPageDto.getDeptId()){
			R<List<SysUser>> r = sysUserService.getUsersByDeptId(mgtShopPageDto.getDeptId());
			List<Long> collect = r.getData().stream().map(SysUser::getUserId).collect(Collectors.toList());
			List<Shop> shops = shopService.getShopBySysUserIds(collect);
			scope.addAll(shops.stream().map(Shop::getShopId).collect(Collectors.toList()));
			}

			Page<MgtShopPageVo> page = new Page<>();
			page.setSize(mgtShopPageDto.getPageSize());
			page.setCurrent(mgtShopPageDto.getPageNum());
			@@ -204,6 +230,12 @@
			}
			}
			}
			}
			if(null != mgtShopPageDto.getDeptId()){
			R<List<SysUser>> r = sysUserService.getUsersByDeptId(mgtShopPageDto.getDeptId());
			List<Long> collect = r.getData().stream().map(SysUser::getUserId).collect(Collectors.toList());
			List<Shop> shops = shopService.getShopBySysUserIds(collect);
			scope.addAll(shops.stream().map(Shop::getShopId).collect(Collectors.toList()));
			}
			List<MgtShopPageVo> mgtShopPageVoList = shopService.pageMgtShop(page,mgtShopPageDto,scope);
			ExcelUtil<MgtShopPageVo> util = new ExcelUtil<MgtShopPageVo>(MgtShopPageVo.class);
			@@ -412,7 +444,12 @@
			.in("belong_user_id", userIds)
			.eq("del_flag", 0))
			.stream().map(Shop::getShopId).collect(Collectors.toList());
			scope.addAll(data);
			if (data.size()==0){
			scope.add(0L);
			}else{
			scope.addAll(data);
			}

			break;
			case "5":
			// 仅个人数据查询当前登陆人关联店铺下的用户
			@@ -423,7 +460,11 @@
			.in("belong_user_id", longs)
			.eq("del_flag", 0))
			.stream().map(Shop::getShopId).collect(Collectors.toList());
			scope.addAll(data1);
			if (data1.size()==0){
			scope.add(0L);
			}else{
			scope.addAll(data1);
			}
			break;
			}
			}
			@@ -490,7 +531,11 @@
			.in("belong_user_id", userIds)
			.eq("del_flag", 0))
			.stream().map(Shop::getShopId).collect(Collectors.toList());
			scope.addAll(data);
			if (data.size()==0){
			scope.add(0L);
			}else{
			scope.addAll(data);
			}
			break;
			case "5":
			// 仅个人数据查询当前登陆人关联店铺下的用户
			@@ -501,7 +546,11 @@
			.in("belong_user_id", longs)
			.eq("del_flag", 0))
			.stream().map(Shop::getShopId).collect(Collectors.toList());
			scope.addAll(data1);
			if (data1.size()==0){
			scope.add(0L);
			}else{
			scope.addAll(data1);
			}
			break;
			}
			}