2023年6月27日08:31:57

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjGoodsDesc.java

@@ -240,4 +240,10 @@ public class PjGoodsDesc implements Serializable {
 	@TableField(exist = false)
 	private BigDecimal inventory;
 
+	/**
+	 * 仓库
+	 */
+	@TableField(exist = false)
+	private String stock;
+
 }

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjOrder.java

@@ -391,18 +391,4 @@ public class PjOrder implements Serializable {
 	 */
 	@TableField(exist = false)
 	private String item;
-
-	/**
-	 * 地址
-	 */
-	@TableField(exist = false)
-	private String $recAddress;
-
-	public String get$recAddress() {
-		return $recAddress;
-	}
-
-	public void set$recAddress(String $recAddress) {
-		this.$recAddress = $recAddress;
-	}
 }

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java

@@ -62,7 +62,7 @@ public interface IUserClient {
 	String GET_USER_BY_ROLE = API_PREFIX + "/getUserByRole";
 
 	@GetMapping(LIST_USER_BY_ROLE_ID)
-	R<List<User>> listUserByRoleId(@RequestParam("roleId") Long roleId);
+	R<List<User>> listUserByRoleId(@RequestParam("roleId") Long roleId,@RequestParam("roleId") String tenantId,@RequestParam("roleId") Long salesCompanyId);
 
 	/**
 	 * 获取用户信息

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/ocean/service/impl/ShippingBillServiceImpl.java

@@ -869,7 +869,7 @@ public class ShippingBillServiceImpl extends ServiceImpl<ShippingBillMapper, Shi
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
+					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/DeclareCustomsServiceImpl.java

@@ -809,7 +809,7 @@ public class DeclareCustomsServiceImpl extends ServiceImpl<DeclareCustomsMapper,
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
+					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/RepairServiceImpl.java

@@ -675,7 +675,7 @@ public class RepairServiceImpl extends ServiceImpl<RepairMapper, Repair> impleme
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
+					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TradingBoxServiceImpl.java

@@ -1285,7 +1285,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			//给角色为财务的人发送消息
 			R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 			if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-				R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
+				R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					for (User datum : userList.getData()) {
 						//循环发送消息
@@ -1888,7 +1888,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					//给角色为财务的人发送消息
 					R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 					if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-						R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
+						R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
 						if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 							for (User datum : userList.getData()) {
 								//循环发送消息
@@ -1997,7 +1997,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					//给角色为财务的人发送消息
 					R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 					if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-						R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
+						R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
 						if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 							for (User datum : userList.getData()) {
 								//循环发送消息
@@ -2184,7 +2184,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
+					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TransportServiceImpl.java

@@ -956,7 +956,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
+					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息
@@ -1107,7 +1107,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
+					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息

blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditProecessServiceImpl.java

@@ -932,7 +932,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 					// 给角色为助理的人发送消息
 					R<String> roleId = sysClient.getRoleIds(AuthUtil.getTenantId(), "助理");
 					if (roleId.isSuccess() && roleId.getData() != null) {
-						R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(roleId.getData()));
+						R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(roleId.getData()),null,null);
 						if (userList.isSuccess() && userList.getData() != null) {
 							userList.getData().forEach(user -> {
 								// 推送消息提醒助理生成采购

blade-service/blade-client/src/main/java/org/springblade/client/message/service/impl/MessageServiceImpl.java

@@ -86,7 +86,7 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
 		//角色id
 		Long roleId = roleByAlias.getData();
 		//查询此角色下全部用户
-		R<List<User>> listR = userClient.listUserByRoleId(roleId);
+		R<List<User>> listR = userClient.listUserByRoleId(roleId,null,null);
 		if (!listR.isSuccess()) {
 			throw new SecurityException("查询用户列表信息错误");
 		}

blade-service/blade-land/src/main/java/org/springblade/land/insurance/service/impl/InsuranceServiceImpl.java

@@ -434,7 +434,7 @@ public class InsuranceServiceImpl extends ServiceImpl<InsuranceMapper, Insurance
 			//给角色为财务的人发送消息
 			R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 			if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-				R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
+				R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					for (User datum : userList.getData()) {
 						//循环发送消息

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderServiceImpl.java

@@ -1519,7 +1519,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 			//给角色为财务的人发送消息
 			R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 			if (clientDeptIds.isSuccess() && com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(clientDeptIds.getData())) {
-				R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
+				R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					for (User datum : userList.getData()) {
 						//循环发送消息

blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/service/impl/PaymentServiceImpl.java

@@ -378,29 +378,29 @@ public class PaymentServiceImpl implements IPaymentService {
 							selectOrder.setXcxStatus(OrderTypeEnum.XSDFH.getType());
 							ipjOrderClient.updateBySrcOrgId(selectOrder.getId()+"");
 							//给角色为财务的人发送消息
-							R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "销售");
+							R<String> clientDeptIds = sysClient.getRoleIds(parametersDetails.getTenantId(), "销售");
 							if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
 								LocalDateTime now = LocalDateTime.now();
 								DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 								String formatted = now.format(formatter);
-								R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
+								R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),parametersDetails.getTenantId(),selectOrder.getSalesCompanyId());
 								if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 									for (User datum : userList.getData()) {
 										//循环发送消息
 										Message sendMessage = new Message();
 										sendMessage.setParameter(selectOrder.getId()+"");
-										sendMessage.setUserName(AuthUtil.getUserName());
-										sendMessage.setUserId(AuthUtil.getUserId());
+										sendMessage.setUserName("外部用户");
+										sendMessage.setUserId(null);
 										sendMessage.setToUserId(datum.getId());
 										sendMessage.setToUserName(datum.getName());
 										sendMessage.setMessageType(1);
-										sendMessage.setTenantId(AuthUtil.getTenantId());
-										sendMessage.setCreateUser(AuthUtil.getUserId());
+										sendMessage.setTenantId(parametersDetails.getTenantId());
+										sendMessage.setCreateUser(null);
 										sendMessage.setCreateTime(new Date());
 										sendMessage.setUrl("/tirePartsMall/salesManagement/saleOrder/index");
 										sendMessage.setPageLabel("销售订单");
 										sendMessage.setPageStatus("this.$store.getters.domSaleStatus");
-										sendMessage.setMessageBody("您有新的订单待处理！单号：" + selectOrder.getOrdNo() + "时间：" +formatted );
+										sendMessage.setMessageBody("您有新的外部销售订单请及时处理！单号：" + selectOrder.getOrdNo() + "时间：" +formatted );
 										R save = messageClient.save(sendMessage);
 										if (!save.isSuccess()) {
 											throw new SecurityException("发送消息失败");

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -7392,7 +7392,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
+					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息
@@ -7574,7 +7574,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			//给角色为财务的人发送消息
 			R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 			if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-				R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
+				R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					for (User datum : userList.getData()) {
 						//循环发送消息

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/impl/CorpsDescServiceImpl.java

@@ -491,6 +491,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 		}
 		corpsDesc.setTenantId(AuthUtil.getTenantId());
 		corpsDesc.setIsDeleted(0);
+		corpsDesc.setCorpType("KH");
 
 		List<CorpsDescVO> list = baseMapper.selectCorpsDescPage(null, corpsDesc);
 		return list;

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/controller/GoodsDescController.java

@@ -327,13 +327,17 @@ public class GoodsDescController extends BladeController {
 	@ApiOperationSupport(order = 12)
 	@ApiOperation(value = "商品下拉", notes = "传入goods")
 	public R<List<PjGoodsDesc>> goodsListXs(PjGoodsDesc goods) {
-
-		List<PjProductLaunch> pjProductLaunchList = productLaunchService.list(new LambdaQueryWrapper<PjProductLaunch>()
+		LambdaQueryWrapper<PjProductLaunch> queryWrapper = new LambdaQueryWrapper<PjProductLaunch>()
 			.eq(PjProductLaunch::getIsDeleted, 0)
 			.ne(PjProductLaunch::getInventory, 0)
-			.eq(PjProductLaunch::getUpAndDownShelves, 1)
-			.and(i -> i.apply("find_in_set(sales_company_id,'" + AuthUtil.getDeptId() + "')")
-				.or().apply("find_in_set('" + AuthUtil.getDeptId() + "',shared_company)")));
+			.eq(PjProductLaunch::getUpAndDownShelves, 1);
+		queryWrapper.apply("find_in_set(sales_company_id,'" + AuthUtil.getDeptId() + "')");
+		if (ObjectUtils.isNotNull(goods.getStock())) {
+			queryWrapper.eq(PjProductLaunch::getBillType,0);
+		} else {
+			queryWrapper.eq(PjProductLaunch::getBillType,1);
+		}
+		List<PjProductLaunch> pjProductLaunchList = productLaunchService.list(queryWrapper);
 		List<Long> ids = pjProductLaunchList.stream().map(PjProductLaunch::getGoodsId).distinct().collect(Collectors.toList());
 		PjCorpsDesc pjCorpsDesc = corpsDescService.getById(goods.getCustomId());
 		String priceSystem = "";
@@ -379,13 +383,19 @@ public class GoodsDescController extends BladeController {
 	public R<PjGoodsDesc> goodsDetail(PjGoodsDesc goods) {
 		goods.setTenantId(AuthUtil.getTenantId());
 		PjGoodsDesc detail = goodsDescService.getGoodsDetail(goods);
-		List<PjProductLaunch> pjProductLaunch = productLaunchService.list(new LambdaQueryWrapper<PjProductLaunch>()
+		LambdaQueryWrapper<PjProductLaunch> lambdaQueryWrapper = new LambdaQueryWrapper<PjProductLaunch>()
 			.eq(PjProductLaunch::getIsDeleted, 0)
 			.eq(PjProductLaunch::getGoodsId, detail.getId())
 			.ne(PjProductLaunch::getInventory, 0)
-			.eq(PjProductLaunch::getUpAndDownShelves, 1)
-			.and(i -> i.apply("find_in_set(sales_company_id,'" + AuthUtil.getDeptId() + "')")
-				.or().apply("find_in_set('" + AuthUtil.getDeptId() + "',shared_company)")));
+			.eq(PjProductLaunch::getUpAndDownShelves, 1);
+		lambdaQueryWrapper.apply("find_in_set(sales_company_id,'" + AuthUtil.getDeptId() + "')");
+		if (ObjectUtils.isNotNull(goods.getStock())) {
+			lambdaQueryWrapper.eq(PjProductLaunch::getBillType,0);
+		} else {
+			lambdaQueryWrapper.eq(PjProductLaunch::getBillType,1);
+		}
+
+		List<PjProductLaunch> pjProductLaunch = productLaunchService.list(lambdaQueryWrapper);
 		PjCorpsDesc pjCorpsDesc = corpsDescService.getById(goods.getCustomId());
 		String priceSystem = "";
 		if (ObjectUtils.isNotNull(pjCorpsDesc)) {

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

@@ -282,7 +282,6 @@ public class OrderController extends BladeController {
 			.eq(PjOrder::getBsType, "XS")
 			.eq(PjOrder::getBusinessSource, OrderTypeEnum.XCX.getType())
 			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())//公司
-			.eq(ObjectUtils.isNotEmpty(order.getXcxStatus()), PjOrder::getXcxStatus, order.getXcxStatus())//状态
 			.eq(ObjectUtils.isNotEmpty(order.getActualPaymentStatus()), PjOrder::getActualPaymentStatus, order.getActualPaymentStatus())//状态
 			.eq(ObjectUtils.isNotEmpty(order.getSalesCompanyName()), PjOrder::getSalesCompanyName, order.getSalesCompanyName())//所属公司
 			.and(ObjectUtils.isNotNull(order.getRetrieval()), i -> i.like(PjOrder::getGoodsNameJoin, order.getRetrieval())
@@ -429,4 +428,27 @@ public class OrderController extends BladeController {
 		return R.data(mapList);
 	}
 
+	/**
+	 * 采购订单请核
+	 */
+	@PostMapping("/checkOrderCG")
+	@ApiOperationSupport(order = 13)
+	@ApiOperation(value = "请核", notes = "传入order")
+	public R checkOrderCG(@RequestBody PjOrder order) {
+		PjOrder declare = orderService.checkOrderCG(order);
+		return R.data(declare);
+	}
+
+	/**
+	 * 采购订单撤销请核
+	 */
+	@PostMapping("/revokeCheckOrderCG")
+	@ApiOperationSupport(order = 13)
+	@ApiOperation(value = "撤销请核", notes = "传入order")
+	public R revokeCheckOrderCG(@RequestBody PjOrder order) {
+		PjOrder declare = orderService.revokeCheckOrderCG(order);
+		return R.data(declare);
+	}
+
+
 }

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

@@ -120,4 +120,8 @@ public interface IOrderService extends IService<PjOrder> {
 	R confirmRefund(PjOrder order);
 
 	PjOrder revokeCheckOrder(PjOrder order);
+
+	PjOrder checkOrderCG(PjOrder order);
+
+	PjOrder revokeCheckOrderCG(PjOrder order);
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -156,8 +156,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		PjCorpsDesc corpsDesc = corpsDescMapper.selectById(order.getCustomerId());
 		order.setCustomerName(corpsDesc.getCname());
 
-		//仓库名称
-		order.setStorageName(storageDescMapper.selectById(order.getStorageId()).getCname());
 		// 获取系统编号
 		R billNo = serialClient.getBillNo(order.getBsType(), order.getBsType(), order.getBsType());
 		if (billNo.getCode() != 200) {
@@ -167,6 +165,17 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 
 		if (order.getBsType().equals(OrderTypeEnum.SALES.getType())) {//销售
 			if (order.getId() == null) {
+
+				if (ObjectUtils.isNull(order.getBillType())) {
+					if (ObjectUtils.isNotNull(order.getStorageId())) {
+						order.setBillType(0);
+						//仓库名称
+						order.setStorageName(storageDescMapper.selectById(order.getStorageId()).getCname());
+					} else {
+						order.setBillType(1);
+					}
+				}
+
 				order.setOrdNo((String) billNo.getData());
 				order.setCreateTime(new Date());
 				order.setCreateUser(AuthUtil.getUserId());
@@ -174,16 +183,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				order.setTenantId(AuthUtil.getTenantId());
 				order.setStatus(OrderTypeEnum.XSLR.getType());
 				order.setBusinessSource(OrderTypeEnum.WEB.getType());
-				//所属公司
-				R<Dept> dept = sysClient.getDept(Long.valueOf(AuthUtil.getDeptId()));
-				if (ObjectUtil.isNotEmpty(dept)) {
-					order.setSalesCompanyId(dept.getData().getId());
-					order.setSalesCompanyName(dept.getData().getFullName());
-					order.setSharedCompanyId(dept.getData().getId());
-					order.setSharedCompanyName(dept.getData().getFullName());
-				} else {
-					throw new SecurityException("未维护所属公司");
-				}
 
 				//根据客户账期计算应结日期
 				if (ObjectUtil.isNotEmpty(corpsDesc.getAccountPeriod())) {
@@ -232,7 +231,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					}
 					item.setBrandName(goodsDesc.getBrandName());
 					//计算成本
-					if (order.getSharedCompanyId().equals(Long.valueOf(AuthUtil.getDeptId()))) {//本地取库存账成本价
+//					if (order.getSharedCompanyId().equals(Long.valueOf(AuthUtil.getDeptId()))) {//本地取库存账成本价
+					if (ObjectUtils.isNotNull(order.getBillType()) && 1 != order.getBillType()) {//本地取库存账成本价
 
 						goodsName = goodsName.append(goodsDesc.getCname()).append(",");
 						retrieval = retrieval.append(goodsDesc.getCnameInt()).append(",");
@@ -240,13 +240,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 						lambdaQueryWrapper.eq(PjStockDesc::getTenantId, AuthUtil.getTenantId())
 							.eq(PjStockDesc::getIsDeleted, 0)
 							.eq(PjStockDesc::getGoodsId, item.getGoodsId());
-						if (ObjectUtils.isNotNull(order.getBillType()) && 1 != order.getBillType()){
-							lambdaQueryWrapper.eq(PjStockDesc::getStorageId, order.getStorageId());
-							if (ObjectUtil.isNotEmpty(goodsDesc.getWhether()) && goodsDesc.getWhether().equals("1")) {//是否管理批次号
-								lambdaQueryWrapper.eq(PjStockDesc::getDot, item.getDot());
-							} else {
-								lambdaQueryWrapper.and(i -> i.eq(PjStockDesc::getDot, "").or().isNull(PjStockDesc::getDot));
-							}
+						lambdaQueryWrapper.eq(PjStockDesc::getStorageId, order.getStorageId());
+						if (ObjectUtil.isNotEmpty(goodsDesc.getWhether()) && goodsDesc.getWhether().equals("1")) {//是否管理批次号
+							lambdaQueryWrapper.eq(PjStockDesc::getDot, item.getDot());
+						} else {
+							lambdaQueryWrapper.and(i -> i.eq(PjStockDesc::getDot, "").or().isNull(PjStockDesc::getDot));
 						}
 						PjStockDesc stockDesc = stockDescMapper.selectOne(lambdaQueryWrapper);
 						if (ObjectUtil.isNotEmpty(stockDesc)) {
@@ -302,7 +300,28 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				//成本
 				order.setCost(order.getOrderItemsList().stream().filter(e -> e.getCostprie() != null).map(PjOrderItems::getCostprie).reduce(BigDecimal.ZERO, BigDecimal::add));
 			}
+			//所属公司
+			R<Dept> dept = sysClient.getDept(Long.valueOf(AuthUtil.getDeptId()));
+			if (ObjectUtil.isNotEmpty(dept)) {
+				order.setSalesCompanyId(dept.getData().getId());
+				order.setSalesCompanyName(dept.getData().getFullName());
+				if (ObjectUtils.isNotNull(order.getBillType()) && 1 != order.getBillType()) {
+					order.setSharedCompanyId(dept.getData().getId());
+					order.setSharedCompanyName(dept.getData().getFullName());
+				} else {
+					if (ObjectUtils.isNotNull(order.getOrderItemsList()) && order.getOrderItemsList().size() > 0) {
+						order.setSharedCompanyId(order.getOrderItemsList().get(0).getSharedCompanyId());
+						order.setSharedCompanyName(order.getOrderItemsList().get(0).getSharedCompanyName());
+					} else {
+						throw new SecurityException("获取所属公司失败");
+					}
+				}
+			} else {
+				throw new SecurityException("未维护所属公司");
+			}
 		} else if (order.getBsType().equals(OrderTypeEnum.PURCHASE.getType())) {//采购
+			//仓库名称
+			order.setStorageName(storageDescMapper.selectById(order.getStorageId()).getCname());
 			if (order.getId() == null) {
 				order.setOrdNo((String) billNo.getData());
 				order.setCreateTime(new Date());
@@ -401,7 +420,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		pjShip.setSalesCompanyName(pjOrder.getSharedCompanyName());
 		pjShip.setSourceCompanyId(pjOrder.getSalesCompanyId());
 		pjShip.setSourceCompanyName(pjOrder.getSalesCompanyName());
-		pjShip.setRecAddress(pjOrder.get$recAddress());
 		shipMapper.insert(pjShip);
 
 		//修改销售状态为待发货
@@ -442,10 +460,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R revokeGenerateShipTask(PjOrder order) {
 		PjOrder pjOrder = baseMapper.selectById(order.getId());
-		PjShip pjShip = shipMapper.selectOne(new LambdaQueryWrapper<PjShip>().eq(PjShip::getIsDeleted, 0).eq(PjShip::getOrdId, order.getId()));
+		PjShip pjShip = shipMapper.selectOne(new LambdaQueryWrapper<PjShip>().eq(PjShip::getIsDeleted, 0)
+			.eq(PjShip::getOrdId, order.getId())
+			.eq(PjShip::getBizTypeName,"FHRW"));
 		if (ObjectUtils.isNotNull(pjShip) && (ObjectUtils.isNull(pjShip.getSendTotalNum()) || new BigDecimal("0.00").compareTo(pjShip.getSendTotalNum()) == 0)) {
 			shipMapper.deleteById(pjShip.getId());
-			shipMapper.deleteById(pjShip.getTaskId());
+			shipMapper.deleteByTaskId(pjShip.getTaskId());
 		} else {
 			throw new RuntimeException("出库已完成，禁止撤销！");
 		}
@@ -601,6 +621,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		}
 		declare.setOriginalStatus(declare.getStatus());
 		declare.setStatus("退款请核");
+		declare.setXcxStatus("退款请核");
 		declare.setCheckStatus("审核请核");
 		baseMapper.updateById(declare);
 
@@ -846,6 +867,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		}
 
 		order.setCheckStatus("审批中");
+		order.setXcxStatus("审批中");
 		baseMapper.updateById(order);
 
 		return R.success("操作成功");
@@ -943,6 +965,84 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 	}
 
 	/**
+	 * 销售申请退款请核
+	 *
+	 * @param order
+	 * @return
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	public PjOrder checkOrderCG(PjOrder order) {
+		PjOrder declare = baseMapper.selectById(order.getId());
+
+		//审批数据
+		AuditProecessDTO auditProecessDTO = new AuditProecessDTO();
+		//获取审批级次
+		List<AuditPathsLevels> auditPathsLevels = null;
+		// 判断是否有审批流,如果审批流已开启就进入审批流,否则直接走申请通过
+		AuditPathsActs pathsActs = null;
+		//是否开启流程
+		pathsActs = checkClient.getActsByActId(1107, "status");
+		//获取审批信息
+		auditPathsLevels = checkClient.listLevelsByActId(1107, "status");
+		auditProecessDTO.setTimes(1);
+		auditProecessDTO.setProcessType("采购审核");
+
+		// 没开启审批流直接走 通过流程
+		if (pathsActs == null || pathsActs.getIsEnable() == 2) {
+			throw new SecurityException("当前租户未查询到审批流配置");
+		} else {
+
+			if (CollectionUtils.isEmpty(auditPathsLevels)) {
+				throw new SecurityException("开启审批失败:未查询到审批信息");
+			}
+
+			// 绑定审核类型
+			auditProecessDTO.setCheckType("PJCG");//代理订单
+			// 追加跳转路由url
+			auditProecessDTO.setUrl(order.getUrl());
+			auditProecessDTO.setPageStatus(order.getPageStatus());
+			auditProecessDTO.setPageLabel(order.getPageLabel());
+			auditProecessDTO.setOrderRemark(declare.getRemarks());//订单备注
+			auditProecessDTO.setPathsLevelsList(auditPathsLevels);
+			auditProecessDTO.setActId(1);
+			auditProecessDTO.setSrcBillId(declare.getId());//申请表id
+			auditProecessDTO.setBillId(declare.getId());//业务id
+			auditProecessDTO.setBillNo(declare.getOrdNo());//业务编号
+			auditProecessDTO.setSendUserId(AuthUtil.getUserId());//请核人id
+			auditProecessDTO.setSendName(AuthUtil.getUserName());//请核人名称
+			auditProecessDTO.setSendTime(new Date());//请核时间
+			auditProecessDTO.setBillTime(declare.getCreateTime());//业务日期
+			auditProecessDTO.setTenantId(AuthUtil.getTenantId());//租户id
+			auditProecessDTO.setCorpId(declare.getCustomerId());
+			R financeProcess = checkClient.createFinanceProcess(auditProecessDTO);
+			if (!financeProcess.isSuccess()) {
+				throw new SecurityException("操作失败,请联系管理员");
+			}
+		}
+		declare.setOriginalStatus(declare.getStatus());
+		declare.setStatus("审核中");
+		declare.setCheckStatus("审核中");
+		baseMapper.updateById(declare);
+
+		return declare;
+	}
+
+	@Override
+	public PjOrder revokeCheckOrderCG(PjOrder order) {
+		PjOrder declare = baseMapper.selectById(order.getId());
+		R financeProcess = checkClient.deteleByBillId(order.getId());
+		if (!financeProcess.isSuccess()) {
+			throw new SecurityException("操作失败,请联系管理员");
+		}
+		declare.setStatus("录入");
+		declare.setCheckStatus("审核撤销");
+		baseMapper.updateById(declare);
+		return declare;
+	}
+
+	/**
 	 * 生成工单历史记录
 	 */
 	public void saveHistory(Long pid, String status) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/productLaunch/controller/ProductLaunchController.java

@@ -97,22 +97,19 @@ public class ProductLaunchController extends BladeController {
 		LambdaQueryWrapper<PjProductLaunch> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(PjProductLaunch::getTenantId, AuthUtil.getTenantId())
 			.eq(PjProductLaunch::getIsDeleted, 0)
-			.eq(ObjectUtils.isNotNull(productLaunch.getBrandId()),PjProductLaunch::getBrandId, productLaunch.getBrandId())
+			.eq(ObjectUtils.isNotNull(productLaunch.getBrandId()), PjProductLaunch::getBrandId, productLaunch.getBrandId())
 			.eq(PjProductLaunch::getBillType, productLaunch.getBillType());
-		if (ObjectUtils.isNotNull(productLaunch.getSourceCompanyId())) {
-			lambdaQueryWrapper.eq(PjProductLaunch::getSalesCompanyId, productLaunch.getSourceCompanyId());//公司
-		} else {
-			lambdaQueryWrapper.eq(PjProductLaunch::getSalesCompanyId, AuthUtil.getDeptId());//公司
-		}
 		lambdaQueryWrapper.like(ObjectUtils.isNotEmpty(productLaunch.getSpecificationAndModel()), PjProductLaunch::getSpecificationAndModel, productLaunch.getSpecificationAndModel())//规格型号
-			.eq(ObjectUtil.isNotEmpty(productLaunch.getUpAndDownShelves()), PjProductLaunch::getUpAndDownShelves, productLaunch.getUpAndDownShelves())//上下架
-			.in(ObjectUtil.isNotEmpty(productLaunch.getSharedCompanyList()), PjProductLaunch::getSharedCompany, productLaunch.getSharedCompanyList());//共享公司
+			.eq(ObjectUtil.isNotEmpty(productLaunch.getUpAndDownShelves()), PjProductLaunch::getUpAndDownShelves, productLaunch.getUpAndDownShelves());//上下架
 		if (ObjectUtil.isNotEmpty(productLaunch.getCname())) {
-			lambdaQueryWrapper.and(i -> i.like(PjProductLaunch::getCname, productLaunch.getCname()).or().like(PjProductLaunch::getCnameInt, productLaunch.getCname()));
+			lambdaQueryWrapper.and(ObjectUtils.isNotNull(productLaunch.getCname()), i -> i.like(PjProductLaunch::getCname, productLaunch.getCname()).or().like(PjProductLaunch::getCnameInt, productLaunch.getCname()));
 		}
-
+		lambdaQueryWrapper.eq(PjProductLaunch::getSalesCompanyId, AuthUtil.getDeptId());
 		if (productLaunch.getBillType() == 1) {
 			lambdaQueryWrapper.eq(PjProductLaunch::getWhetherShare, 0);
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(productLaunch.getSourceCompanyId()), PjProductLaunch::getSourceCompanyId, productLaunch.getSourceCompanyId());//公司
+		} else {
+			lambdaQueryWrapper.apply(ObjectUtil.isNotEmpty(productLaunch.getSharedCompany()), "find_in_set('" + productLaunch.getSharedCompany() + "',shared_company)");//共享公司
 		}
 		IPage<PjProductLaunch> pages = productLaunchService.page(Condition.getPage(query), lambdaQueryWrapper);
 		String deptId = pages.getRecords().stream().map(PjProductLaunch::getSharedCompany).filter(ObjectUtils::isNotNull).distinct().collect(Collectors.joining());

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/productLaunch/service/impl/ProductLaunchServiceImpl.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springblade.client.feign.ISerialClient;
@@ -370,6 +371,9 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 						launchList.add(selOne);
 					}
 				}
+				if (ObjectUtils.isNotNull(productLaunch.getSharedCompany())){
+					productLaunch.setSharedCompany(productLaunch.getSharedCompany().substring(1));
+				}
 				LambdaQueryWrapper<PjProductLaunch> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 				lambdaQueryWrapper.eq(PjProductLaunch::getTenantId, AuthUtil.getTenantId())
 					.eq(PjProductLaunch::getBillType, 1)
@@ -689,6 +693,7 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 			if (StringUtil.isNotBlank(productLaunch.getSharedCompany())) {
 				R<List<Dept>> dept = iSysClient.getDeptListIByName(AuthUtil.getTenantId(), productLaunch.getSharedCompany());
 				for (Dept item : dept.getData()) {
+					productLaunch.setSharedCompany(productLaunch.getSharedCompany() + "," + item.getId());
 					PjProductLaunch launch = new PjProductLaunch();
 					BeanUtils.copyProperties(productLaunch, launch);
 
@@ -735,6 +740,9 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 						launchList.add(selOne);
 					}
 				}
+				if (ObjectUtils.isNotNull(productLaunch.getSharedCompany())){
+					productLaunch.setSharedCompany(productLaunch.getSharedCompany().substring(1));
+				}
 				LambdaQueryWrapper<PjProductLaunch> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 				lambdaQueryWrapper.eq(PjProductLaunch::getTenantId, AuthUtil.getTenantId())
 					.eq(PjProductLaunch::getBillType, 1)

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/controller/ShipController.java

@@ -144,7 +144,7 @@ public class ShipController extends BladeController {
 						item.setCreateUserName(user.getName());
 					}
 				}
-				item.setItem(shipItemsService.count(new LambdaQueryWrapper<PjShipItems>().eq(PjShipItems::getPid,item.getId()))+"");
+				item.setItem(shipItemsService.count(new LambdaQueryWrapper<PjShipItems>().eq(PjShipItems::getIsDeleted,0).eq(PjShipItems::getPid,item.getId()))+"");
 			});
 		}
 

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/mapper/ShipMapper.java

@@ -39,4 +39,5 @@ public interface ShipMapper extends BaseMapper<PjShip> {
 	 */
 	List<ShipVO> selectShipPage(IPage page, ShipVO ship);
 
+    void deleteByTaskId(Long taskId);
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/mapper/ShipMapper.xml

@@ -29,7 +29,11 @@
         <result column="storage_name" property="storageName"/>
         <result column="sales_company_id" property="salesCompanyId"/>
         <result column="sales_company_name" property="salesCompanyName"/>
+        <result column="task_id" property="taskId"/>
     </resultMap>
+    <delete id="deleteByTaskId">
+        update pjpf_ship set is_deleted = 1 where task_id = #{taskId}
+    </delete>
 
 
     <select id="selectShipPage" resultMap="shipResultMap">

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -358,7 +358,6 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					} else {
 						orderItems.setSendNum(orderItems.getSendNum().add(item.getSendNum()));
 					}
-					orderItems.setDot(orderItems.getDot() + "," + item.getDot());
 					pjOrderItemsList.add(orderItems);
 				} else {
 					throw new RuntimeException("数据异常请联系管理员");

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java

@@ -215,7 +215,6 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 			.eq(Dept::getParentId, 0)
 			.eq(Dept::getTenantId, AuthUtil.getTenantId())
 			.eq(Dept::getIsDeleted, 0)
-			.eq(Dept::getFullName, deptName)
 			.apply("find_in_set(full_name,'" + deptName + "')")
 		);
 		return R.data(dept);

blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java

@@ -31,10 +31,7 @@ import org.springblade.system.user.entity.UserInfo;
 import org.springblade.system.user.entity.UserOauth;
 import org.springblade.system.user.enums.UserEnum;
 import org.springblade.system.user.service.IUserService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -57,16 +54,26 @@ public class UserClient implements IUserClient {
 
 	@Override
 	@GetMapping(LIST_USER_BY_ROLE_ID)
-	public R<List<User>> listUserByRoleId(Long roleId) {
+	public R<List<User>> listUserByRoleId(Long roleId, String tenantId,Long salesCompanyId) {
 		LambdaQueryWrapper<User> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		userLambdaQueryWrapper
-			.eq(User::getIsDeleted, 0)
-			.eq(User::getTenantId, AuthUtil.getTenantId());
-		if ("883868".equals(AuthUtil.getTenantId())) {
-			userLambdaQueryWrapper.eq(User::getDeptId, AuthUtil.getDeptId())
-				.apply("find_in_set('" + roleId + "',role_id)");
-		} else {
-			userLambdaQueryWrapper.eq(User::getRoleId, roleId);
+			.eq(User::getIsDeleted, 0);
+		if (ObjectUtils.isNotNull(tenantId) && ObjectUtils.isNotNull(salesCompanyId)){
+			if ("883868".equals(tenantId)) {
+				userLambdaQueryWrapper.eq(User::getDeptId, salesCompanyId)
+					.apply("find_in_set('" + roleId + "',role_id)");
+			} else {
+				userLambdaQueryWrapper.eq(User::getRoleId, roleId);
+			}
+			userLambdaQueryWrapper.eq(User::getTenantId,tenantId);
+		}else{
+			if ("883868".equals(AuthUtil.getTenantId())) {
+				userLambdaQueryWrapper.eq(User::getDeptId, AuthUtil.getDeptId())
+					.apply("find_in_set('" + roleId + "',role_id)");
+			} else {
+				userLambdaQueryWrapper.eq(User::getRoleId, roleId);
+			}
+			userLambdaQueryWrapper.eq(User::getTenantId, AuthUtil.getTenantId());
 		}
 		return R.data(service.list(userLambdaQueryWrapper));
 	}
@@ -89,7 +96,7 @@ public class UserClient implements IUserClient {
 	@Override
 	@GetMapping(GET_USER_BY_ROLE)
 	public List<User> getUserByRole() {
-		R<String> res = sysClient.getRoleIds("业务员", AuthUtil.getTenantId());
+		R<String> res = sysClient.getRoleIds(AuthUtil.getTenantId(),"业务员");
 		if (!res.isSuccess()) {
 			return new ArrayList<>();
 		} else {
@@ -97,7 +104,7 @@ public class UserClient implements IUserClient {
 			userLambdaQueryWrapper
 				.eq(User::getIsDeleted, 0)
 				.eq(User::getTenantId, AuthUtil.getTenantId())
-				.apply("find_in_set(role_id,'" + res.getData() + "')");
+				.apply("find_in_set('" + res.getData() + "',role_id)");
 			if ("883868".equals(AuthUtil.getTenantId())) {
 				userLambdaQueryWrapper.eq(User::getDeptId, AuthUtil.getDeptId());
 			}

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -476,7 +476,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 						// 给角色为助理的人发送消息
 						R<String> roleId = sysClient.getRoleIds(AuthUtil.getTenantId(), "助理");
 						if (roleId.isSuccess() && roleId.getData() != null) {
-							R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(roleId.getData()));
+							R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(roleId.getData()),null,null);
 							if (userList.isSuccess() && userList.getData() != null) {
 								userList.getData().forEach(user -> {
 									// 推送消息提醒助理生成采购

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -2580,7 +2580,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						//给角色为财务的人发送消息
 						R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 						if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-							R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
+							R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
 							if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 								for (User datum : userList.getData()) {
 									//循环发送消息
@@ -2758,7 +2758,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
+					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息