文件上传和排序接口整合

@@ -150,7 +150,7 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple
         this.save(fileDO);
 
         //重新排序
-        fileWrapper.lambda().eq(DgFileDO::getBsmCatalog, firstBsmCatalog).ge(DgFileDO::getXh, firstXh + 1);
+        fileWrapper.lambda().eq(DgFileDO::getBsmCatalog, firstBsmCatalog).gt(DgFileDO::getXh, firstXh + 1);
         List<DgFileDO> list = this.list(fileWrapper);
         list.forEach(item -> item.setXh(item.getXh() + 1));
         return this.updateBatchById(list);

@@ -50,7 +50,7 @@
                 BSM_ARCHIVES = #{bsmArchive,jdbcType=VARCHAR}
             </if>
         </where>
-        order by DAC.XH
+        order by DF.XH,DAC.XH
     </select>
 
     <!--<update id="updateFileSort">-->