得到的

C02-system/pps-core-system/src/main/resources/mybatis/mapper/pps/core/system/SysOrganizationViewMapper.xml

@@ -37,6 +37,15 @@
         <result column="ELEVATION" property="elevation"/>
 
     </resultMap>
+
+    <sql id="now" databaseId="Oracle">
+        SYSDATE
+    </sql>
+
+    <sql id="now" databaseId="MySQL">
+        NOW()
+    </sql>
+
     <sql id="Base_Column_List">
         ID
         ,
@@ -84,7 +93,7 @@
     </select>
 
     <select id="selectSysOrganizationList" parameterType="pps.core.system.entity.SysOrganizationView"
-            resultMap="BaseResultMap">
+            resultMap="BaseResultMap" databaseId="Oracle">
         SELECT
         OU.ID,
         OU.OU_CODE,
@@ -110,7 +119,52 @@
         SYS_ORGANIZATION_REL SOR
         LEFT JOIN SYS_ORGANIZATION OU ON OU.ID = SOR.OU_ID
         <where>
-            SOR.END_TIME >= NOW()
+            SOR.END_TIME >= SYSDATE
+            AND OU.IS_DELETED = #{isDeleted}
+            <if test="id != null and id != ''">
+                AND SOR.PARENT_OU_ID = #{id}
+            </if>
+            <if test="ouCode != null and ouCode != ''">
+                AND OU.OU_CODE LIKE '%' || #{ouCode} || '%'
+            </if>
+            <if test="ouName != null and ouName != ''">
+                AND OU.OU_NAME LIKE '%' || #{ouName} || '%'
+            </if>
+            <if test="shortName != null and shortName != ''">
+                AND OU.SHORT_NAME LIKE '%' || #{shortName} || '%'
+            </if>
+        </where>
+        ORDER BY SOR.SORT ASC
+    </select>
+
+    <select id="selectSysOrganizationList" parameterType="pps.core.system.entity.SysOrganizationView"
+            resultMap="BaseResultMap" databaseId="MySQL">
+        SELECT
+        OU.ID,
+        OU.OU_CODE,
+        OU.OU_NAME,
+        OU.SHORT_NAME,
+        OU.OU_LEVEL,
+        OU.DESCRIPTION,
+        OU.POST_CODE,
+        OU.POST_ADDRESS,
+        OU.FAX_NO,
+        OU.PHONE,
+        OU.COUNTRY,
+        OU.PROVINCE,
+        SOR.ID AS SOR_ID,
+        SOR.SORT,
+        SOR.PARENT_OU_ID,
+        SOR.IS_HAS_CHILDREN,
+        OU.LONGITUDE,
+        OU.LATITUDE,
+        OU.ELEVATION,
+        ( SELECT SO.OU_NAME FROM SYS_ORGANIZATION SO WHERE SOR.PARENT_OU_ID = SO.ID ) AS PARTENT_NAME
+        FROM
+        SYS_ORGANIZATION_REL SOR
+        LEFT JOIN SYS_ORGANIZATION OU ON OU.ID = SOR.OU_ID
+        <where>
+            SOR.END_TIME >= <include refid="now"/>
             AND OU.IS_DELETED = #{isDeleted}
             <if test="id != null and id != ''">
                 AND SOR.PARENT_OU_ID = #{id}
@@ -172,7 +226,7 @@
         'ou' AS TYPE
         FROM SYS_ORGANIZATION SO
         LEFT JOIN SYS_ORGANIZATION_REL SOR ON SOR.OU_ID = SO.ID
-        WHERE SO.IS_DELETED = #{isDeleted} AND SOR.END_TIME >= NOW()
+        WHERE SO.IS_DELETED = #{isDeleted} AND SOR.END_TIME >= <include refid="now"/>
         <if test="parentOuId != null and parentOuId != ''">
             AND PARENT_OU_ID =#{parentOuId}
         </if>
@@ -192,7 +246,7 @@
         LEFT JOIN SYS_ORGANIZATION_REL SOR ON SOR.OU_ID = SO.ID
         <where>
             SO.IS_DELETED = #{isDeleted}
-            AND SOR.EFFECT_TIME &lt;= NOW() AND SOR.END_TIME &gt;= NOW()
+            AND SOR.EFFECT_TIME &lt;= <include refid="now"/> AND SOR.END_TIME &gt;= <include refid="now"/>
             AND SOR.PARENT_OU_ID=#{id}
             OR SO.ID=#{id}
         </where>
@@ -211,7 +265,7 @@
         LEFT JOIN SYS_ORGANIZATION_REL SOR ON SOR.OU_ID = SO.ID
         <where>
             SO.IS_DELETED = #{isDeleted}
-            AND SOR.EFFECT_TIME &lt;= NOW() AND SOR.END_TIME &gt;= NOW()
+            AND SOR.EFFECT_TIME &lt;= <include refid="now"/> AND SOR.END_TIME &gt;= <include refid="now"/>
             AND SOR.PARENT_OU_ID=#{id}
         </where>
     </select>
@@ -238,7 +292,7 @@
         SELECT R.OU_ID AS ID,R.PARENT_OU_ID,S.OU_NAME,S.SHORT_NAME FROM SYS_ORGANIZATION_REL R
         LEFT JOIN SYS_ORGANIZATION S ON R.OU_ID = S.ID
         WHERE S.IS_DELETED = 1
-        AND R.EFFECT_TIME &lt;= NOW() AND R.END_TIME &gt;= NOW()
+        AND R.EFFECT_TIME &lt;= <include refid="now"/> AND R.END_TIME &gt;= <include refid="now"/>
         AND R.OU_ID IN
         <foreach collection="list" open="(" close=")" separator="," item="item">
             #{item}
@@ -462,7 +516,7 @@
         FROM SYS_ORGANIZATION SO
         LEFT JOIN SYS_ORGANIZATION_REL SOR ON SOR.PARENT_OU_ID = SO.ID
         <where>
-            SOR.END_TIME >= NOW()
+            SOR.END_TIME >= <include refid="now"/>
             AND SOR.OU_ID IN
             <foreach collection="list" open="(" close=")" separator="," item="item">
                 #{item}
@@ -530,7 +584,7 @@
         SYS_ORGANIZATION O
         WHERE
         R.OU_ID = O.ID
-        AND R.END_TIME >= NOW()
+        AND R.END_TIME >= <include refid="now"/>
         AND O.IS_DELETED = 1
         <if test="parentOuId != null and parentOuId != ''">
             AND R.PARENT_OU_ID = #{parentOuId}
@@ -597,7 +651,7 @@
          FROM SYS_ORGANIZATION O
                   LEFT JOIN SYS_ORGANIZATION_REL R ON O.ID = R.OU_ID
          WHERE R.PARENT_OU_ID = #{id}
-           AND R.END_TIME >= NOW()
+           AND R.END_TIME >= <include refid="now"/>
            AND O.IS_DELETED = 1
          ORDER BY R.SORT)
         UNION ALL
@@ -634,7 +688,7 @@
          FROM SYS_ORGANIZATION O
                   LEFT JOIN SYS_ORGANIZATION_REL R ON O.ID = R.OU_ID
          WHERE R.PARENT_OU_ID = #{id}
-           AND R.END_TIME >= NOW()
+           AND R.END_TIME >= <include refid="now"/>
            AND O.IS_DELETED = 1
          ORDER BY R.SORT)
         UNION ALL
@@ -673,15 +727,16 @@
     <select id="selectOrgList" parameterType="pps.core.system.entity.SysOrganizationView"
             resultMap="ExtendResultMap">
         SELECT ROW_NUMBER() OVER ( ORDER BY R.SORT ) AS RN, O.ID,
-               O.OU_NAME AS OU_NAME,
-               ''        AS LINE_ID,
-               'ORG'     AS OU_LEVEL,
-               ''        AS GRID_TYPE_KEY
+        O.OU_NAME AS OU_NAME,
+        '' AS LINE_ID,
+        'ORG' AS OU_LEVEL,
+        '' AS GRID_TYPE_KEY
         FROM SYS_ORGANIZATION O
-                 LEFT JOIN SYS_ORGANIZATION_REL R ON O.ID = R.OU_ID
+        LEFT JOIN SYS_ORGANIZATION_REL R ON O.ID = R.OU_ID
         WHERE O.ID = #{id}
-          AND R.END_TIME >= NOW()
-          AND O.IS_DELETED = 1
+        AND R.END_TIME >=
+        <include refid="now"/>
+        AND O.IS_DELETED = 1
         ORDER BY R.SORT
     </select>
 
@@ -695,7 +750,7 @@
         FROM SYS_ORGANIZATION O
                  LEFT JOIN SYS_ORGANIZATION_REL R ON O.ID = R.OU_ID
         WHERE O.ID = #{id}
-          AND R.END_TIME >= NOW()
+          AND R.END_TIME >= <include refid="now"/>
           AND O.IS_DELETED = 1
         ORDER BY R.SORT
     </select>