[Improve] query sql bug fixed.

apache · Oct 2, 2024 · 99d75b4 · 99d75b4
1 parent a0541f1
commit 99d75b4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/...park-console/streampark-console-service/src/main/resources/mapper/core/ResourceMapper.xml b/...park-console/streampark-console-service/src/main/resources/mapper/core/ResourceMapper.xml
@@ -24,12 +24,22 @@
         from t_resource v
         inner join t_user u
         on v.creator_id = u.user_id
-        and v.team_id = ${resource.teamId}
+        and v.team_id = #{resource.teamId}
         <if test="resource.resourceName != null and resource.resourceName != ''">
-            and v.resourceName like concat('%', '${resource.resourceName}', '%')
+            <if test="_databaseId == 'mysql'">
+                and v.resourceName like concat('%', #{resource.resourceName},'%')
+            </if>
+            <if test="_databaseId == 'pgsql'">
+                and v.resourceName like '%' || #{resource.resourceName} || '%'
+            </if>
         </if>
         <if test="resource.description != null and resource.description != ''">
-            and v.description like concat('%', '${resource.description}', '%')
+            <if test="_databaseId == 'mysql'">
+                and v.description like concat('%', #{resource.description},'%')
+            </if>
+            <if test="_databaseId == 'pgsql'">
+                and v.description like '%' || #{resource.description} || '%'
+            </if>
         </if>
     </select>
 
@@ -40,7 +50,7 @@
                 END
         from t_resource
         where creator_id = #{userId}
-        limit 1
+         limit 1
     </select>
 
 

diff --git a/...sole/streampark-console-service/src/main/resources/mapper/core/SparkApplicationMapper.xml b/...sole/streampark-console-service/src/main/resources/mapper/core/SparkApplicationMapper.xml
@@ -51,7 +51,12 @@
                 and t.deploy_mode = #{app.deployMode}
             </if>
             <if test="app.appName != null and app.appName != ''">
-                and t.app_name like concat('%', '${app.appName}', '%')
+                <if test="_databaseId == 'mysql'">
+                    and t.app_name like concat('%', #{app.appName},'%')
+                </if>
+                <if test="_databaseId == 'pgsql'">
+                    and t.app_name like '%' || #{app.appName} || '%'
+                </if>
             </if>
             <if test="app.clusterId != null and app.clusterId != ''">
                 and t.cluster_id = #{app.clusterId}
@@ -63,7 +68,12 @@
                 and t.user_id = #{app.userId}
             </if>
             <if test="app.tags != null and app.tags != ''">
-                and t.tags like concat('%', '${app.tags}', '%')
+                <if test="_databaseId == 'mysql'">
+                    and t.tags like concat('%', #{app.tags},'%')
+                </if>
+                <if test="_databaseId == 'pgsql'">
+                    and t.tags like '%' || #{app.tags} || '%'
+                </if>
             </if>
         </where>
     </select>