1. 删除状态值

chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml

@@ -57,11 +57,9 @@
 
     <select id="pageList" resultType="com.chushang.inspection.terminal.vo.StoreTerminalVO">
         <include refid="selectStoreTerminalSql"/>
-        <where>
         <if test="1 == 1">
             ${query.sqlParam.get('sqlWhere')}
         </if>
-        </where>
         ORDER BY #{query.orderBy} #{query.isAsc}
     </select>
     <sql id="selectStoreTerminalSql">
@@ -116,6 +114,7 @@
                  INNER JOIN st_store s ON t.store_id = s.store_id
                  INNER JOIN ta_polling_task pt ON t.task_id = pt.id
                  INNER JOIN wrk_project p ON pt.project_id = p.project_id
+        where t.del_state = 0
     </sql>
     <select id="selectPageApp" resultType="com.chushang.inspection.project.vo.TerminalAppVO">
         SELECT t.terminal_id        AS terminalId,
@@ -134,7 +133,7 @@
                  LEFT JOIN st_terminal_ins ti ON t.terminal_id = ti.terminal_id
                  LEFT JOIN ta_polling_task pt on pt.id = t.lower_task_id
                  INNER JOIN st_store s ON s.store_id = t.store_id
-        <where>
+        WHERE t.del_state = 0
         <if test="query.taskId != null">
             AND t.task_id = #{query.taskId}
         </if>
@@ -174,7 +173,6 @@
         <if test="1 == 1">
             ${query.sqlParam.get('dataScope')}
         </if>
-        </where>
         ORDER BY t.create_time DESC
     </select>
 
@@ -212,12 +210,10 @@
         from st_terminal t1
         left join st_store t2 on t1.store_id = t2.store_id
         left join st_terminal_ins t3 on t3.terminal_id = t1.terminal_id
-
-        <where>
+        where t1.del_state = 0
             <if test="query.taskId != null">
                 AND t1.task_id = #{query.taskId}
             </if>
-        </where>
         ORDER BY t1.create_time DESC limit 10
     </select>
 </mapper>