2 커밋 bbbe7bb38e ... 5ae7e7f720

작성자 SHA1 메시지 날짜
  qinguocai 5ae7e7f720 Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0 1 년 전
  qinguocai 5c2e3cd207 BUG修复 策略删除后再次添加 水位重复问题 1 년 전

+ 0 - 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/BerthingTimeConfigMapper.java

@@ -3,10 +3,8 @@ package com.ruoyi.system.mapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.system.domain.BerthingFloatConfig;
 import com.ruoyi.system.domain.BerthingTimeConfig;
-import com.ruoyi.system.paramet.StopPointQuery;
 import com.ruoyi.system.paramet.TimePointQuery;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.data.domain.Pageable;
 import java.util.List;
 
 /**

+ 1 - 0
ruoyi-system/src/main/resources/mapper/BerthingFloatConfigMapper.xml

@@ -91,6 +91,7 @@
             <if test="type != null">
                 and type = #{type}
             </if>
+                and is_del = 0
         </where>
     </select>
 

+ 1 - 0
ruoyi-system/src/main/resources/mapper/BerthingPointConfigMapper.xml

@@ -98,6 +98,7 @@
             <if test="factors != null and factors != ''">
                 and factors = #{factors}
             </if>
+                and is_del = 0
         </where>
     </select>
 

+ 1 - 0
ruoyi-system/src/main/resources/mapper/BerthingTimeConfigMapper.xml

@@ -101,6 +101,7 @@
             <if test="type != null">
                 and type = #{type}
             </if>
+                and is_del = 0
         </where>
     </select>