销售、采购、融资采购导出缺少制单更新人问题

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderController.java

@@ -45,6 +45,7 @@ import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 配件销售采购表 控制器
@@ -245,6 +246,7 @@ public class OrderController extends BladeController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入order")
 	public void listExport(PjOrder order, HttpServletResponse response) {
+		BladeUser exportUser = AuthUtil.getUser();
 		LambdaQueryWrapper<PjOrder> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.select(PjOrder::getId, PjOrder::getOrdNo, PjOrder::getSrcOrdNo, PjOrder::getBusinessSource,
 				PjOrder::getSalesCompanyName, PjOrder::getCustomerName, PjOrder::getSalerName, PjOrder::getStorageName,
@@ -258,10 +260,10 @@ public class OrderController extends BladeController {
 				PjOrder::getGoodsTotalShipNum, PjOrder::getSalesAmount, PjOrder::getRefno, PjOrder::getPrimaryGoodsTotalNum,
 				PjOrder::getPrimaryFundingAmount, PjOrder::getUseAdvanceChargeAmount, PjOrder::getProduceAdvanceChargeAmount,
 				PjOrder::getCost, PjOrder::getGrossProfit, PjOrder::getFreight)
-			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
+			.eq(PjOrder::getTenantId, exportUser.getTenantId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, order.getBsType())
-			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())//公司
+			.eq(PjOrder::getSalesCompanyId, exportUser.getDeptId())//公司
 			.eq(ObjectUtils.isNotEmpty(order.getStorageId()), PjOrder::getStorageId, order.getStorageId())//仓库
 			.eq(ObjectUtils.isNotEmpty(order.getReturnsStatus()), PjOrder::getReturnsStatus, order.getReturnsStatus())//退货状态
 			.like(ObjectUtils.isNotEmpty(order.getStorageName()), PjOrder::getStorageName, order.getStorageName())
@@ -328,22 +330,10 @@ public class OrderController extends BladeController {
 		}
 		List<PjOrder> pages = orderService.list(lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(pages)) {
-			List<Long> userIds = new ArrayList<>();
-			List<Long> createUser = pages.stream().map(PjOrder::getCreateUser).filter(Objects::nonNull).distinct().collect(Collectors.toList());
-			if (!createUser.isEmpty()) {
-				userIds.addAll(createUser);
-			}
-			List<Long> updateUser = pages.stream().map(PjOrder::getUpdateUser).filter(Objects::nonNull).filter(id -> !userIds.contains(id)).collect(Collectors.toList());
-			if (!updateUser.isEmpty()) {
-				userIds.addAll(updateUser);
-			}
-			StringBuilder user = new StringBuilder();
+			List<Long> userIds = pages.stream().flatMap(e -> Stream.of(e.getCreateUser(), e.getUpdateUser())).filter(Objects::nonNull).distinct().collect(Collectors.toList());
 			List<User> userList = new ArrayList<>();
-			for (Long item : userIds) {
-				user.append(item).append(",");
-			}
-			if (ObjectUtils.isNotNull(user.toString())) {
-				userList = iUserClient.selectUserList(user.substring(0, user.length() - 1));
+			if (!org.springframework.util.CollectionUtils.isEmpty(userIds)) {
+				userList = iUserClient.selectListNotTenantId(exportUser.getTenantId(), userIds.stream().distinct().map(String::valueOf).collect(Collectors.joining(",")));
 			}
 			List<PjOrderItems> pjOrderItemsList = orderItemsService.list(new LambdaQueryWrapper<PjOrderItems>()
 				.eq(PjOrderItems::getTenantId, AuthUtil.getTenantId())