Merge remote-tracking branch 'origin/master'

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsRentalOrderMapper.java

@@ -61,4 +61,7 @@ public interface PlantsRentalOrderMapper extends BaseMapperPlus<PlantsRentalOrde
         "FROM plants_rental_order")
     Map<String, Object> countOrderAndAmount();
 
+    @Select("SELECT COUNT(DISTINCT customer_name) FROM plants_rental_order")
+    Integer countDistinctCustomerName();
+
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsRentalOrderServiceImpl.java

@@ -406,10 +406,9 @@ public class PlantsRentalOrderServiceImpl implements IPlantsRentalOrderService {
      */
     @Override
     public Map<String, Integer> countCustomers() {
-        LambdaQueryWrapper<PlantsRentalOrder> lqw = Wrappers.lambdaQuery();
+        Integer count= baseMapper.countDistinctCustomerName();
-        lqw.groupBy(PlantsRentalOrder::getCustomerName);
         Map<String, Integer> map = new HashMap<>();
-        map.put("count",baseMapper.selectVoList(lqw).size());
+        map.put("count",count);
         return map;
     }
 }