2024/04/28_模型接口修改

rs-website/rs-website-server/src/main/resources/mapper/TModelMapper.xml

@@ -72,10 +72,11 @@
         t.is_del = 0
         <if test="modelCn != null and modelCn != ''">
             AND t.model_cn like concat('%',#{modelCn},'%')
+            OR t.model_en like concat('%',#{modelCn},'%')
         </if>
-        <if test="modelEn != null and modelEn != ''">
-            AND t.model_en like concat('%',#{modelEn},'%')
-        </if>
+<!--        <if test="modelEn != null and modelEn != ''">-->
+<!--            AND t.model_en like concat('%',#{modelEn},'%')-->
+<!--        </if>-->
         <if test="releasedBy != null and releasedBy != ''">
             AND t.released_by like concat('%',#{releasedBy},'%')
         </if>
@@ -100,7 +101,7 @@
         GROUP BY t.`id`
         <choose>
             <when test="orderBy == 1">
-                ORDER BY t.`views`,t.`id` desc
+                ORDER BY t.`views` desc
             </when>
             <when test="orderBy == 2">
                 ORDER BY t.create_time,t.id desc
@@ -109,7 +110,7 @@
                 ORDER BY ttr.`model_type_id`,t.id desc
             </when>
             <when test="orderBy == 4">
-                ORDER BY t.released_by,t.id desc
+                ORDER BY t.released_by desc
             </when>
         </choose>
     </select>