xzc пре 6 дана
родитељ
комит
5a21b57b61

+ 2 - 1
tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/boilertaskorderitem/BoilerTaskOrderItemMapper.xml

@@ -240,7 +240,8 @@
             <if test="hasPermission != null and hasPermission == false">
                 AND 1 = 2
             </if>
-            order by bto.CREATE_TIME desc
+<!--            order by bto.CREATE_TIME desc-->
+            order by bto.CREATE_TIME desc,btoir.sort
         </where>
         ) a
         OFFSET ${(pageNo - 1) * pageSize} ROWS FETCH NEXT #{pageSize} ROWS ONLY

+ 2 - 1
tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/pipetaskorderitem/PipeTaskOrderItemMapper.xml

@@ -239,7 +239,8 @@
             <if test="projectNo != null and projectNo != ''">
                 HAVING WM_CONCAT(epp.PROJECT_NO) LIKE CONCAT('%',#{projectNo},'%')
             </if>
-            order by bto.CREATE_TIME desc
+            <!--            order by bto.CREATE_TIME desc-->
+            order by bto.CREATE_TIME desc,btoir.sort
         </where>
         ) a
         OFFSET ${(pageNo - 1) * pageSize} ROWS FETCH NEXT #{pageSize} ROWS ONLY