运行记录优化070502

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotopeationfill/IotOpeationFillOrderMapper.java

@@ -45,7 +45,6 @@ public interface IotOpeationFillOrderMapper extends BaseMapperX<IotOpeationFillO
                 .inIfPresent(IotOpeationFillOrderDO::getId, orderIds)
                 .eqIfPresent(IotOpeationFillOrderDO::getOrderType, reqVO.getOrderType())
                 .eqIfPresent(IotOpeationFillOrderDO::getOrderStatus, reqVO.getOrderStatus())
-                .likeIfPresent(IotOpeationFillOrderDO::getUserName, reqVO.getOrderName())
                 .eqIfPresent(IotOpeationFillOrderDO::getUserId, reqVO.getUserId())
                 .betweenIfPresent(IotOpeationFillOrderDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(IotOpeationFillOrderDO::getCreateTime)

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/IotOpeationFillMapper.xml

@@ -206,17 +206,24 @@
     <select id="getOrderIds" parameterType="cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillRespVO"
             resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
         select
-            distinct order_id
-        from rq_iot_opeation_fill
+            distinct a.order_id
+        from
+        rq_iot_opeation_fill a,
+        rq_iot_opeation_fill_order b
         where
-            deleted = 0
+            a.order_id = b.id
+        and
+            a.deleted = 0
         and
-            order_id is not null
+            b.deleted = 0
+        and
+            a.order_id is not null
         and(
         <if test="orgName != null and orgName != ''">
             (
-            device_name LIKE CONCAT('%', #{orgName}, '%')
-            OR device_code LIKE CONCAT('%', #{orgName}, '%')
+            a.device_name LIKE CONCAT('%', #{orgName}, '%')
+            OR a.device_code LIKE CONCAT('%', #{orgName}, '%')
+            or b.user_name LIKE CONCAT('%', #{orgName}, '%')
             )
         </if>
         <if test="orgName == null or orgName == ''">