2023年8月11日13:35:15

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -3805,6 +3805,7 @@ ORDER BY
         WHERE
             bo.tenant_id = #{order.tenantId}
           AND bo.is_deleted = '0'
+          AND boi.is_deleted = '0'
           AND order_no = #{order.orderNo}
         ORDER BY
             bo.create_time DESC

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/wing/accessories/WebpageController.java

@@ -13,6 +13,7 @@ import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.feign.ICorpsAttnClient;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.common.annotation.RepeatSubmit;
+import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
@@ -147,8 +148,10 @@ public class WebpageController {
 		if ("1".equals(order.getModular())) {
 			lambdaQueryWrapper.apply("balance_amount > 0");
 		}
-		if (AuthUtil.getUserRole().contains("销售") || AuthUtil.getUserRole().contains("业务员")) {
-			lambdaQueryWrapper.eq(Order::getCreateUser, AuthUtil.getUserId());
+		if (AuthUtil.getUserRole().contains("管理员")){
+			if (AuthUtil.getUserRole().contains("销售") || AuthUtil.getUserRole().contains("业务员")) {
+				lambdaQueryWrapper.eq(Order::getCreateUser, AuthUtil.getUserId());
+			}
 		}
 		if ("0".equals(order.getSort())) {
 			if ("1".equals(order.getTypeSort())) {