Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml

@@ -51,7 +51,7 @@
             <if test="documentTypeCode != '' and documentTypeCode != null">
                 AND sys_workplace_document.documentTypeCode = #{documentTypeCode}
             </if>
-            <if test="isPopular >= 0 and isPopular != null">
+            <if test="isPopular != null and isPopular > 0">
                 AND sys_workplace_document.isPopular = #{isPopular}
             </if>
             <if test="busKey != null and busKey != ''">
@@ -60,6 +60,7 @@
                     )
             </if>
         </where>
+         ORDER BY sys_workplace_document.isPopular  desc  ,sys_workplace_document.number,sys_workplace_document.createTime
     </select>
     <select id="findMaxNumberByWorkplaceCode" resultType="java.lang.Integer">
         SELECT MAX(number) AS maxNumber