2022年11月21 16:21

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

@@ -974,7 +974,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 						// 判断比较大小
 						if (orderQuantity.compareTo(surplusRouteQuantity) > 0) {
-							throw new SecurityException("锁定库存失败:原单据的订货数量大于可用库存,无法锁定");
+							throw new SecurityException("锁定库存失败:原单据的"+oneStock.getCode()+"订货数量大于可用库存,无法锁定");
 						}
 						if (surplusRouteQuantity == null) {
 							throw new SecurityException("锁定库存失败:可用库存为空,禁止操作");

blade-service/trade-purchase/src/main/java/com/trade/purchase/extra/service/impl/LeadsServiceImpl.java

@@ -121,9 +121,11 @@ public class LeadsServiceImpl extends ServiceImpl<LeadsMapper, Leads> implements
 		leadsQueryWrapper.eq(Leads::getIsDeleted, 0);
 		leadsQueryWrapper.like(ObjectUtil.isNotEmpty(leads.getCreateUserName()), Leads::getCreateUserName, leads.getCreateUserName());
 
-		String userRole = AuthUtil.getUserRole();
-		if (!userRole.contains("抄送人")) {
-			leadsQueryWrapper.eq(Leads::getCreateUser, AuthUtil.getUserId());
+		if(AuthUtil.getTenantId().equals("681169")){
+			String userRole = AuthUtil.getUserRole();
+			if (!userRole.contains("抄送人")) {
+				leadsQueryWrapper.eq(Leads::getCreateUser, AuthUtil.getUserId());
+			}
 		}
 		leadsQueryWrapper.orderByDesc(Leads::getCreateTime);
 		IPage<Leads> pages = baseMapper.selectPage(Condition.getPage(query), leadsQueryWrapper);