Merge remote-tracking branch 'origin/v7.0_small_version_fix_20231120' into…

performance-web/src/main/java/com/clx/performance/sqlProvider/OwnerRunningWaterRecordSqlProvider.java

@@ -93,8 +93,9 @@ public class OwnerRunningWaterRecordSqlProvider {
                     " a.owner_user_name,a.running_water_no, a.mobile, a.account_type, a.running_water_type,a.order_id,a.order_no,a.order_child_id,a.order_child_no,a.alteration_balance," +
                     " a.account_balance,a.usable_balance,a.take_out_balance,a.frozen_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
             FROM("owner_running_water_record a");
-            //WHERE("a.owner_user_no = #{param.userNo}");
-
+            if (ObjectUtil.isNotNull(param.getUserNo())) {
+                WHERE("a.owner_user_no = #{param.userNo}");
+            }
             if (StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime())) {
                 WHERE("a.create_time >= #{param.beginTime} and a.create_time <= #{param.endTime}");
             }