ea375b6d by 荆蔚杰

文件上传和排序接口整合

1 parent eeb29e78
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 </sql> 26 </sql>
27 27
28 <resultMap id="result" type="com.pashanhoo.file.entity.vo.DgCatalogWithFileVO"> 28 <resultMap id="result" type="com.pashanhoo.file.entity.vo.DgCatalogWithFileVO">
29 <result column="BSM_ARCHIVES" property="bsmArchive"/> 29 <result column="bsm_archives" property="bsmArchive"/>
30 <result column="bsm_catalog" property="bsmCatalog"/> 30 <result column="bsm_catalog" property="bsmCatalog"/>
31 <result column="wjmc" property="wjmc"/> 31 <result column="wjmc" property="wjmc"/>
32 <result column="catalogXh" property="catalogXh"/> 32 <result column="catalogXh" property="catalogXh"/>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
49 join DG_ARCHIVES DA on DAC.BSM_ARCHIVES = DA.BSM_ARCHIVES 49 join DG_ARCHIVES DA on DAC.BSM_ARCHIVES = DA.BSM_ARCHIVES
50 <where> 50 <where>
51 <if test="bsmArchive != null and bsmArchive != ''"> 51 <if test="bsmArchive != null and bsmArchive != ''">
52 BSM_ARCHIVES = #{bsmArchive,jdbcType=VARCHAR} 52 DAC.BSM_ARCHIVES = #{bsmArchive,jdbcType=VARCHAR}
53 </if> 53 </if>
54 </where> 54 </where>
55 order by DF.XH,DAC.XH 55 order by DF.XH,DAC.XH
......