添加大厅与窗口关联

base-manager/src/main/resources/sqlmap/module/window/WindowMapperExt.xml

@@ -8,12 +8,12 @@
         FROM
         mortals_sys_window AS a
         LEFT JOIN ( SELECT windowId FROM mortals_sys_window_hall
-        <trim suffixOverrides="where" suffix="">
+        )AS b ON a.id = b.windowId where b.hallId IS NULL
+        <trim prefixOverrides="and" prefix="">
             <if test="condition.siteId!=null and condition.siteId!=''">
-                where siteId = #{condition.siteId,jdbcType=VARCHAR}
+                and a.siteId = #{condition.siteId}
             </if>
         </trim>
-        )AS b ON a.id = b.windowId where b.hallId IS NULL
     </select>
 
     <!-- 获取事项差集列表列表 -->
@@ -23,11 +23,13 @@
         FROM
         mortals_sys_window AS a
         LEFT JOIN ( SELECT windowId FROM mortals_sys_window_hall
-        <trim suffixOverrides="where" suffix="">
+        )AS b ON a.id = b.windowId where b.hallId IS NULL
+
+        <trim prefixOverrides="and" prefix="">
             <if test="condition.siteId!=null and condition.siteId!=''">
-                where siteId = #{condition.siteId,jdbcType=VARCHAR}
+                and a.siteId = #{condition.siteId}
             </if>
         </trim>
-        )AS b ON a.id = b.windowId where b.hallId IS NULL
+
     </select>
 </mapper>
\ No newline at end of file