Merge remote-tracking branch 'origin/master'

xuhy

15 小时以前 206fcf7d6afae27856f63cf0158f53b61fa1b86f

 ruoyi-system/src/main/resources/mapper/system/TErpMaintenanceReminderMapper.xml

@@ -38,10 +38,10 @@
                 left join t_erp_goods t4 on t3.goods_id = t4.id
        where t1.disabled = 0 and #{tomorrow} >= t1.maintenance_time
          <if test="user.roleType !=null and user.roleType==4">
              and t1.clinic_supplier_id = #{user.supplierClinicId} and t1.maintenance_type=1
              and t1.clinic_supplier_id = #{supplierClinicId} and t1.maintenance_type=1
          </if>
          <if test="user.roleType !=null and user.roleType==5">
              and t1.clinic_supplier_id = #{user.supplierClinicId} and t1.maintenance_type=2
              and t1.clinic_supplier_id = #{supplierClinicId} and t1.maintenance_type=2
          </if>
         <if test="query.warehouseNo != null and query.warehouseNo != ''">
            and t3.warehouse_no =#{query.warehouseNo}