申购、待采购、已采购页面数据隔离

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseServiceImpl.java

@@ -204,13 +204,13 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
             wrapper.like("json_unquote(p.victoriatourist_json -> '$.receiptWarehouseId')", dto.getReceiptWarehouseId());
         }
         //采购金额
-        wrapper.ge(Purchase::getAmount, dto.getStartAmount());
-        wrapper.le(Purchase::getAmount, dto.getEndAmount());
+        wrapper.ge("p", Purchase::getAmount, dto.getStartAmount());
+        wrapper.le("p", Purchase::getAmount, dto.getEndAmount());
         //采购人
-        wrapper.eq(Purchase::getCreateUser, dto.getPurchaseUserId());
+        wrapper.eq("p", Purchase::getCreateUser, dto.getPurchaseUserId());
         //采购时间
-        wrapper.ge(Purchase::getCreateTime, dto.getPurchaseStartTime());
-        wrapper.le(Purchase::getCreateTime, dto.getPurchaseEndTime());
+        wrapper.ge("p", Purchase::getCreateTime, dto.getPurchaseStartTime());
+        wrapper.le("p", Purchase::getCreateTime, dto.getPurchaseEndTime());
 
         //添加权限过滤
         DynamicDataSourceContextHolder.push(SourceConstant.BASE);
@@ -223,6 +223,7 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
             }
         }
 
+        wrapper.groupBy("p.id");
         Page<PurchaseVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<PurchaseVo> list = page.getRecords();
         if (ObjectUtils.isEmpty(list)) {