perf: 关联字典表，返回字典表名称

@@ -16,23 +16,39 @@
     </resultMap>
 
     <select id="getPage" resultMap="DTOMap">
-        SELECT id,name,dict_item_id,dict_item_name,status,tenant_id,create_time,creator,update_time,updater
-        FROM tk_device_profile_category
+        SELECT
+        tkdpc.id,
+        tkdpc.name,
+        tkdpc.dict_item_id,
+        sys_dict_item.item_text as dict_item_name,
+        tkdpc.status,
+        tkdpc.tenant_id,
+        tkdpc.create_time,
+        tkdpc.creator,
+        tkdpc.update_time,
+        tkdpc.updater
+        FROM tk_device_profile_category tkdpc
+        LEFT JOIN sys_dict_item ON (sys_dict_item.item_value=tkdpc.dict_item_id)
         WHERE 1=1
-        <if test="isSysAdmin == false ">
-            AND  tenant_id = '13814000-1dd2-11b2-8080-808080808080' AND status = 1
-            OR tenant_id = #{tenantId}
+        <if test="isSysAdmin == false">
+            AND tkdpc.tenant_id = #{tenantId}
+            <if test="status !=null">
+                AND  tkdpc.status  = #{status}
+            </if>
+        </if>
+        <if test="status != 0 and isSysAdmin == false">
+            OR (tkdpc.tenant_id = '13814000-1dd2-11b2-8080-808080808080' AND tkdpc.status = 1)
         </if>
         <if test="status !=null">
-            AND  status  = #{status}
+            AND  tkdpc.status  = #{status}
         </if>
         <if test="dictItemId !=null and dictItemId !=''">
-            AND  dict_item_id  = #{dictItemId}
+            AND  tkdpc.dict_item_id  = #{dictItemId}
         </if>
         <if test="name !=null and name !=''">
-            AND  name  = #{name}
+            AND  tkdpc.name  like concat('%',#{name},'%')
         </if>
-        ORDER BY create_time desc
+        ORDER BY tkdpc.create_time desc
         <if test="page != null">
             LIMIT #{pageSize}
             OFFSET (#{page} - 1) * #{pageSize};
@@ -41,20 +57,26 @@
 
     <select id="getPageSize" resultType="java.lang.Long">
         SELECT COUNT(1)
-        FROM tk_device_profile_category
+        FROM tk_device_profile_category tkdpc
+        LEFT JOIN sys_dict_item ON (sys_dict_item.item_value=tkdpc.dict_item_id)
         WHERE 1=1
-        <if test="isSysAdmin == false ">
-            AND  tenant_id = '13814000-1dd2-11b2-8080-808080808080' AND status = 1
-            OR tenant_id = #{tenantId}
+        <if test="isSysAdmin == false">
+            AND tkdpc.tenant_id = #{tenantId}
+            <if test="status !=null">
+                AND  tkdpc.status  = #{status}
+            </if>
+        </if>
+        <if test="status != 0 and isSysAdmin == false">
+            OR (tkdpc.tenant_id = '13814000-1dd2-11b2-8080-808080808080' AND tkdpc.status = 1)
         </if>
-        <if test="status !=null and status !=''">
-            AND  status  = #{status}
+        <if test="status !=null">
+            AND  tkdpc.status  = #{status}
         </if>
         <if test="dictItemId !=null and dictItemId !=''">
-            AND  dict_item_id  = #{dictItemId}
+            AND  tkdpc.dict_item_id  = #{dictItemId}
         </if>
         <if test="name !=null and name !=''">
-            AND  name  = #{name}
+            AND  tkdpc.name  like concat('%',#{name},'%')
         </if>
     </select>