Merge branch 'master' of http://1.94.244.160:3000/shuzhihua/pms-iot

yudao-module-pms/yudao-module-pms-abc/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.iocoder.boot</groupId>
         <artifactId>yudao-module-pms</artifactId>
-        <version>2.4.2-jdk8-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>yudao-module-pms-abc</artifactId>

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/iotprojecttask/IotProjectTaskMapper.xml

@@ -115,7 +115,9 @@
                 #{taskId}
             </foreach>
         </if>
-        ORDER BY a.id DESC
+        ORDER BY
+            CASE WHEN a.status = 'wg' THEN 1 ELSE 0 END ASC,
+            a.id DESC
     </select>
 
 </mapper>