Kaynağa Gözat

Merge remote-tracking branch 'origin/test'

songyh 3 yıl önce
ebeveyn
işleme
caa37a1bcc

+ 6 - 1
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialInfoMapper.xml

@@ -153,7 +153,12 @@
         <if test="offlineFlag!=null">
             and matInfo.offline_flag = #{offlineFlag}
         </if>
-        order by matInfo.confirm_time desc
+        <if test="status=1">
+            order by matInfo.confirm_time desc
+        </if>
+        <if test="status!=1">
+            order by matInfo.create_time desc
+        </if>
 
     </select>
     <select id="getListByDate" resultType="cn.com.ctop.common.module.entity.MaterialInfo">