--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/statuteLibrary/SaveUpdateStatuteLibraryForm.java

@@ -40,7 +40,7 @@ public class SaveUpdateStatuteLibraryForm {
 	@ApiModelProperty("所属部门")
 	private String department;
 	@ApiModelProperty("所属部门")
-	private String departmentId;
+	private Integer departmentId;
 	@ApiModelProperty("关键词")
 	private String keyword;
 	@ApiModelProperty("正文")

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/statuteLibrary/StatuteLibrary.java

@@ -48,7 +48,7 @@ public class StatuteLibrary {
 	@ApiModelProperty("所属部门")
 	private String department;
 	@ApiModelProperty("所属部门")
-	private String departmentId;
+	private Integer departmentId;
 	@ApiModelProperty("关键词")
 	private String keyword;
 	@ApiModelProperty("正文")

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/audiolibrary/AudioLibraryMapper.java

@@ -28,7 +28,7 @@ public interface AudioLibraryMapper extends BaseMapper<AudioLibrary> {
 			    + "select distinct a.id,a.name,a.source,g.price,g.priceType,g.sellingPrice,"
 				+ "DATE_FORMAT(a.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,a.timeLength,"
 				+ "a.size,a.status,a.isDelete,g.dataSources,a.bookName from res_audio_library a "
-				+ "LEFT JOIN res_resource_relation ad on a.id = ad.objectId "
+				+ "LEFT JOIN res_classify_relation ad on a.id = ad.objectId "
 				+ "LEFT JOIN res_audio_goods g on a.id=g.objectId "
 				+ "where 1=1 and a.isDelete = 0 "
 		    + "</if>"

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/statuteLibrary/StatuteLibraryMapper.java

@@ -33,7 +33,7 @@ public interface StatuteLibraryMapper extends BaseMapper<StatuteLibrary>{
 			+ "a.isDelete,g.dataSources from res_statute_Library a "
 			
 			+ "<if test='"+ NOTBLANK +"(form.diyTypeCode)'>"  
-				+ "INNER JOIN res_resource_relation ad on a.id = ad.objectId "
+				+ "INNER JOIN res_classify_relation ad on a.id = ad.objectId "
 			+ "</if>"
 				
 			+ "INNER JOIN res_statute_goods g on a.id=g.objectId "