1.品牌-花纹 增加 同步花纹 同步轮胎基础信息的品牌到花纹 去重

2.app 增加的客户的登录账号  也同步仓库过来
3.内部员工账号允许多仓
4.统计分析，应收、应付、利润增加仓库检索
5.销售订单添加商品，按照仓库区分库存
6.仓库下拉选按照用户区分权限
7.小铃铛消息提醒区分仓库
8.出入库接口库存成本价，金额计算问题修改

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

@@ -510,7 +510,14 @@ public class PaymentServiceImpl implements IPaymentService {
 							//给角色为财务的人发送消息
 							R<String> clientDeptIds = sysClient.getRoleIds(parametersDetails.getTenantId(), "客服");
 							if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-								R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), parametersDetails.getTenantId(), selectOrder.getSalesCompanyId() + "",selectOrder.getStorageId());
+								String status = sysClient.paramServiceValue( parametersDetails.getTenantId(),"whether.branch.management");
+								Long storage_id = null;
+								if ("1".equals(status)) {
+									storage_id = selectOrder.getStorageId();
+								}
+								R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(),
+									parametersDetails.getTenantId(), selectOrder.getSalesCompanyId() + "",
+									storage_id);
 								if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 									for (User datum : userList.getData()) {
 										if (ObjectUtils.isNotNull(datum.getOaOpenId())) {
@@ -939,7 +946,14 @@ public class PaymentServiceImpl implements IPaymentService {
 							//给角色为财务的人发送消息
 							R<String> clientDeptIds = sysClient.getRoleIds(parametersDetails.getTenantId(), "客服");
 							if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-								R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), parametersDetails.getTenantId(), selectOrder.getSalesCompanyId() + "",selectOrder.getStorageId());
+								String status = sysClient.paramServiceValue( parametersDetails.getTenantId(),"whether.branch.management");
+								Long storage_id = null;
+								if ("1".equals(status)) {
+									storage_id = selectOrder.getStorageId();
+								}
+								R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(),
+									parametersDetails.getTenantId(), selectOrder.getSalesCompanyId() + "",
+									storage_id);
 								if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 									for (User datum : userList.getData()) {
 										if (ObjectUtils.isNotNull(datum.getOaOpenId())) {
@@ -1167,7 +1181,14 @@ public class PaymentServiceImpl implements IPaymentService {
 								System.out.println("所属公司id：" + selectOrder.getSalesCompanyId());
 								System.out.println("租户号：" + parametersDetails.getTenantId());
 								System.out.println("角色id：" + clientDeptIds.getData());
-								R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), parametersDetails.getTenantId(), selectOrder.getSalesCompanyId() + "",selectOrder.getStorageId());
+								String status = sysClient.paramServiceValue( parametersDetails.getTenantId(),"whether.branch.management");
+								Long storage_id = null;
+								if ("1".equals(status)) {
+									storage_id = selectOrder.getStorageId();
+								}
+								R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(),
+									parametersDetails.getTenantId(), selectOrder.getSalesCompanyId() + "",
+									storage_id);
 								if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 									for (User datum : userList.getData()) {
 										if (ObjectUtils.isNotNull(datum.getOaOpenId())) {

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

@@ -4379,7 +4379,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		//给角色为财务的人发送消息
 		R<String> clientDeptIds = sysClient.getRoleIds(dept.getTenantId(), "客服");
 		if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-			R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), dept.getTenantId(), dept.getId() + "", sharePjOrder.getStorageId());
+			Long storage_id = null;
+			if (ParameterUtils.whetherDatabaseSharding()) {
+				storage_id = sharePjOrder.getStorageId();
+			}
+			R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), dept.getTenantId(),
+				dept.getId() + "", storage_id);
 			if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 				for (User datum : userList.getData()) {
 					//循环发送消息
@@ -5983,8 +5988,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		//给角色为派工的人发送消息
 		R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "派工");
 		if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
+			Long storageId = null;
+			if (ParameterUtils.whetherDatabaseSharding()) {
+				storageId = order.getStorageId();
+			}
 			R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(),
-				pjShip.getSalesCompanyId() + "", order.getStorageId());
+				pjShip.getSalesCompanyId() + "", storageId);
 			if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 				for (User datum : userList.getData()) {
 					//循环发送消息

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

@@ -53,6 +53,7 @@ import org.springblade.salesPart.ship.service.IShipItemsService;
 import org.springblade.salesPart.ship.service.IShipService;
 import org.springblade.salesPart.stock.service.IStockDescService;
 import org.springblade.salesPart.storage.mapper.StorageDescMapper;
+import org.springblade.salesPart.util.ParameterUtils;
 import org.springblade.salesPart.vo.OrderRecordVO;
 import org.springblade.salesPart.vo.ShipVO;
 import org.springblade.system.entity.Dept;
@@ -553,8 +554,12 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 			//给角色为派工的人发送消息
 			R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "库管");
 			if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
+				Long storageId = null;
+				if (ParameterUtils.whetherDatabaseSharding()) {
+					storageId = rwShip.getStorageId();
+				}
 				R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(),
-					item.getSalesCompanyId() + "",rwShip.getStorageId());
+					item.getSalesCompanyId() + "",storageId);
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					for (User datum : userList.getData()) {
 						//循环发送消息
@@ -603,8 +608,12 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 			R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "客服,库管");
 			StringBuilder openIds = new StringBuilder();
 			if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
+				Long storageId = null;
+				if (ParameterUtils.whetherDatabaseSharding()) {
+					storageId = rwShip.getStorageId();
+				}
 				R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(),
-					rwShip.getSalesCompanyId() + "",rwShip.getStorageId());
+					rwShip.getSalesCompanyId() + "",storageId);
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					for (User datum : userList.getData()) {
 						if (ObjectUtils.isNotNull(datum.getOaOpenId())) {
@@ -1782,8 +1791,12 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 				//给角色为派工的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "库管");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
+					Long storageId = null;
+					if (ParameterUtils.whetherDatabaseSharding()) {
+						storageId = item.getStorageId();
+					}
 					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(),
-						item.getSalesCompanyId() + "",item.getStorageId());
+						item.getSalesCompanyId() + "",storageId);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息
@@ -3614,8 +3627,12 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 				//给角色为派工的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "库管");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
+					Long storageId = null;
+					if (ParameterUtils.whetherDatabaseSharding()) {
+						storageId = item.getStorageId();
+					}
 					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(),
-						item.getSalesCompanyId() + "",item.getStorageId());
+						item.getSalesCompanyId() + "",storageId);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息
@@ -4338,8 +4355,12 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 				//给角色为派工的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "库管");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
+					Long storageId = null;
+					if (ParameterUtils.whetherDatabaseSharding()) {
+						storageId = item.getStorageId();
+					}
 					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(),
-						item.getSalesCompanyId() + "",item.getStorageId());
+						item.getSalesCompanyId() + "",storageId);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息
@@ -5599,8 +5620,12 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 				//给角色为派工的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "库管");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
+					Long storage_id = null;
+					if (ParameterUtils.whetherDatabaseSharding()) {
+						storage_id = item.getStorageId();
+					}
 					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(),
-						item.getSalesCompanyId() + "",item.getStorageId());
+						item.getSalesCompanyId() + "",storage_id);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息
@@ -5631,8 +5656,12 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 			StringBuilder openIds = new StringBuilder();
 			R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "客服");
 			if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
+				Long storage_id = null;
+				if (ParameterUtils.whetherDatabaseSharding()) {
+					storage_id = rwShip.getStorageId();
+				}
 				R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(),
-					rwShip.getSalesCompanyId() + "",rwShip.getStorageId());
+					rwShip.getSalesCompanyId() + "",storage_id);
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					for (User datum : userList.getData()) {
 						if (ObjectUtils.isNotNull(datum.getOaOpenId())) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shoppingCart/service/impl/ShoppingCartServiceImpl.java

@@ -39,6 +39,7 @@ import org.springblade.salesPart.shopping.entity.ShoppingMallDetail;
 import org.springblade.salesPart.shopping.mapper.ShoppingMallDetailMapper;
 import org.springblade.salesPart.shoppingCart.mapper.ShoppingCartMapper;
 import org.springblade.salesPart.shoppingCart.service.IShoppingCartService;
+import org.springblade.salesPart.util.ParameterUtils;
 import org.springblade.salesPart.util.UserUtils;
 import org.springblade.salesPart.util.WxParamUtil;
 import org.springblade.salesPart.vo.ShoppingCartVO;
@@ -739,8 +740,12 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "客服");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
+					Long storage_id = null;
+					if (ParameterUtils.whetherDatabaseSharding()) {
+						storage_id = item.getStorageId();
+					}
 					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(),
-						item.getSalesCompanyId() + "",item.getStorageId());
+						item.getSalesCompanyId() + "",storage_id);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息
@@ -1589,8 +1594,12 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 			//给角色为财务的人发送消息
 			R<String> clientDeptIds = sysClient.getRoleIds(bladeUser.getTenantId(), "客服");
 			if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
+				Long storage_id = null;
+				if (ParameterUtils.whetherDatabaseSharding()) {
+					storage_id = item.getStorageId();
+				}
 				R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), bladeUser.getTenantId(),
-					item.getSalesCompanyId() + "",item.getStorageId());
+					item.getSalesCompanyId() + "",storage_id);
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					for (User datum : userList.getData()) {
 						//循环发送消息

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

@@ -77,7 +77,9 @@ public class UserClient implements IUserClient {
 			}
 			userLambdaQueryWrapper.eq(User::getTenantId, AuthUtil.getTenantId());
 		}
-		userLambdaQueryWrapper.apply("find_in_set(" + storageId + ",storage_id)");
+		if (ObjectUtils.isNotNull(storageId)){
+			userLambdaQueryWrapper.apply("find_in_set(" + storageId + ",storage_id)");
+		}
 		return R.data(service.list(userLambdaQueryWrapper));
 	}