--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/annexlibrary/FgAnnexLibraryLabelContentDiyTypeMapper.java

@@ -15,7 +15,7 @@ import com.zrqx.core.vo.resource.fg.label.FgLabelInfoVO;
 public interface FgAnnexLibraryLabelContentDiyTypeMapper extends BaseMapper<AnnexLibraryLabelContentDiyType> {
 
 	@Select("<script>"
-			+ "SELECT DISTINCT al.labelId, l.name, l.englishName, l.nationsType "
+			+ "SELECT al.labelId, l.name, l.englishName, l.nationsType "
 			+ "FROM res_annex_library a "
 			+ "left join res_annex_library_label_content_diy_type al ON a.id = al.annexId "
 			+ "left join res_label_content_diy_type lc on al.labelContentDiyTypeId = lc.id "
@@ -32,7 +32,7 @@ public interface FgAnnexLibraryLabelContentDiyTypeMapper extends BaseMapper<Anne
 	List<FgLabelInfoVO> queryLabelList(@Param("ids")List<String> ids);
 	
 	@Select("<script>"
-			+ "SELECT DISTINCT al.labelId, al.labelContentDiyTypeId id, lc.labelContent, lc.parentId, lc.englishName, lc.sort, al.labelContentDiyTypeCode code "
+			+ "SELECT al.labelId, al.labelContentDiyTypeId id, lc.labelContent, lc.parentId, lc.englishName, lc.sort, al.labelContentDiyTypeCode code "
 			+ "FROM res_annex_library a "
 			+ "left join res_annex_library_label_content_diy_type al ON a.id = al.annexId "
 			+ "left join res_label_content_diy_type lc on al.labelContentDiyTypeId = lc.id "

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/articlelibrary/FgArticleLibraryDiyTypeMapper.java

@@ -14,7 +14,7 @@ import com.zrqx.core.vo.resource.fg.diytype.FgDiyTypeVo;
 public interface FgArticleLibraryDiyTypeMapper extends BaseMapper<ArticleLibraryDiyType> {
 
 	@Select("<script>"
-			+ "select distinct dt.id, dt.parentId, dt.sort, dt.showName, dt.code "
+			+ "select dt.id, dt.parentId, dt.sort, dt.showName, dt.code "
 			+ "from res_Article_Library a "
 			+ "left join res_Article_Library_Diy_Type ad on a.id = ad.alid "
 			+ "left join res_Diy_Type dt on ad.code = dt.code "

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/articlelibrary/FgArticleLibraryLabelContentDiyTypeMapper.java

@@ -15,7 +15,7 @@ import com.zrqx.core.vo.resource.fg.label.FgLabelInfoVO;
 public interface FgArticleLibraryLabelContentDiyTypeMapper extends BaseMapper<ArticleLibraryLabelContentDiyType> {
 
 	@Select("<script>"
-			+ "SELECT DISTINCT al.labelId, l.name, l.englishName, l.nationsType "
+			+ "SELECT al.labelId, l.name, l.englishName, l.nationsType "
 			+ "FROM res_article_library a "
 			+ "left join res_article_library_label_content_diy_type al ON a.id = al.alId "
 			+ "left join res_label_content_diy_type lc on al.labelContentDiyTypeId = lc.id "
@@ -32,7 +32,7 @@ public interface FgArticleLibraryLabelContentDiyTypeMapper extends BaseMapper<Ar
 	List<FgLabelInfoVO> queryLabelList(@Param("ids")List<String> ids);
 	
 	@Select("<script>"
-			+ "SELECT DISTINCT al.labelId, al.labelContentDiyTypeId id, lc.labelContent, lc.parentId, lc.englishName, lc.sort, al.labelContentDiyTypeCode code "
+			+ "SELECT al.labelId, al.labelContentDiyTypeId id, lc.labelContent, lc.parentId, lc.englishName, lc.sort, al.labelContentDiyTypeCode code "
 			+ "FROM res_article_library a "
 			+ "left join res_article_library_label_content_diy_type al ON a.id = al.alId "
 			+ "left join res_label_content_diy_type lc on al.labelContentDiyTypeId = lc.id "

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/articlelibrary/FgArticleLibraryMapper.java

@@ -19,10 +19,10 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	 * @return
 	 */
 	@Select("<script>" 
-			+ "select distinct a.* "
+			+ "select a.id,a.name,a.synopsis,a.text,a.bookId,a.bookName,a.uploadTime,a.resourceType,a.browseNum,a.goodsType "
 			+ "from res_Article_Library a  "
 			+ "where a.status = 1 "
-			+ "<if test='form.resourceType != null' >"
+			/*+ "<if test='form.resourceType != null' >"
 			+ "and a.resourceType = #{form.resourceType}"
 			+ "</if>" 
 			+ "<if test='form.ids != null and form.ids.size > 0' >"
@@ -30,7 +30,7 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 			+ " <foreach collection=\"form.ids\" index=\"index\" item=\"id\" open=\"(\" separator=\",\" close=\")\">" 
 			+ "#{id}" 
 			+ "</foreach>" 
-			+ "</if>"
+			+ "</if>"*/
 		    + "</script>")
 	List<FgArticleLibraryListVO> queryOtherRecommendArticle(@Param("form")FgQueryRecommedArticleForm form);
 	
@@ -39,7 +39,7 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	 * @return
 	 */
 	@Select("<script>" 
-			+ "select distinct a.id,a.name,a.keywords,a.synopsis,a.author,a.bookName,a.price,a.realPrice,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.img,a.nationsType,a.resourceType,a.browseNum,a.goodsType,a.text "
+			+ "select a.id,a.name,a.keywords,a.synopsis,a.author,a.bookName,a.price,a.realPrice,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.img,a.nationsType,a.resourceType,a.browseNum,a.goodsType,a.text "
 			+ "from res_Article_Library a  "
 			+ "where a.status = 1 "
 			+ "<if test='ids != null and ids.size > 0' >"
@@ -56,7 +56,7 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	 * @return
 	 */
 	@Select("<script>" 
-			+ "select distinct a.* "
+			+ "select  a.* "
 			+ "from res_Article_Library a  "
 			+ "where a.status = 1 "
 			+ "<if test='form.resourceType != null' >"
@@ -82,7 +82,7 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	 * @return
 	 */
 	@Select("<script>" 
-			+ "select distinct a.id,a.name,a.keywords,a.synopsis,a.author,a.bookName,a.price,a.realPrice,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.img,a.nationsType,a.resourceType,a.browseNum,a.goodsType "
+			+ "select a.id,a.name,a.keywords,a.synopsis,a.author,a.bookName,a.price,a.realPrice,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.img,a.nationsType,a.resourceType,a.browseNum,a.goodsType "
 			+ "from res_Article_Library a  "
 			+ "where a.status = 1 "
 			+ "<if test='ids != null and ids.size > 0' >"
@@ -100,7 +100,7 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	 * @return
 	 */
 	@Select("<script>" 
-			+ "select distinct a.id,a.name,a.authorId,a.author,a.source,a.keywords,a.synopsis,a.bookId,"
+			+ "select a.id,a.name,a.authorId,a.author,a.source,a.keywords,a.synopsis,a.bookId,"
 			+ "a.bookName,a.price,a.realPrice,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,"
 			+ "a.img,a.readTextPower,a.nationsType,a.resourceType,a.browseNum,a.goodsType "
 			+ "from res_Article_Library a "

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/audiolibrary/FgAudioLibraryLabelContentDiyTypeMapper.java

@@ -15,7 +15,7 @@ import com.zrqx.core.vo.resource.fg.label.FgLabelInfoVO;
 public interface FgAudioLibraryLabelContentDiyTypeMapper extends BaseMapper<AudioLibraryLabelContentDiyType> {
 
 	@Select("<script>"
-			+ "SELECT DISTINCT al.labelId, l.name, l.englishName, l.nationsType "
+			+ "SELECT al.labelId, l.name, l.englishName, l.nationsType "
 			+ "FROM res_audio_library a "
 			+ "left join res_audio_library_label_content_diy_type al ON a.id = al.audioId "
 			+ "left join res_label_content_diy_type lc on al.labelContentDiyTypeId = lc.id "
@@ -32,7 +32,7 @@ public interface FgAudioLibraryLabelContentDiyTypeMapper extends BaseMapper<Audi
 	List<FgLabelInfoVO> queryLabelList(@Param("ids")List<String> ids);
 	
 	@Select("<script>"
-			+ "SELECT DISTINCT al.labelId, al.labelContentDiyTypeId id, lc.labelContent, lc.parentId, lc.englishName, lc.sort, al.labelContentDiyTypeCode code "
+			+ "SELECT al.labelId, al.labelContentDiyTypeId id, lc.labelContent, lc.parentId, lc.englishName, lc.sort, al.labelContentDiyTypeCode code "
 			+ "FROM res_audio_library a "
 			+ "left join res_audio_library_label_content_diy_type al ON a.id = al.audioId "
 			+ "left join res_label_content_diy_type lc on al.labelContentDiyTypeId = lc.id "

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/audiolibrary/FgAudioLibraryMapper.java

@@ -18,7 +18,7 @@ public interface FgAudioLibraryMapper extends BaseMapper<AudioLibrary> {
 	 * 获取推荐视频
 	 */
 	@Select("<script>" 
-			+ "select distinct a.* "
+			+ "select a.* "
 			+ "from res_audio_Library a  "
 			+ "where a.status = 1 "
 			+ "<if test='form.resourceType != null' >"
@@ -45,7 +45,7 @@ public interface FgAudioLibraryMapper extends BaseMapper<AudioLibrary> {
 	 * @return
 	 */
 	@Select("<script>" 
-			+ "select distinct a.* "
+			+ "select a.* "
 			+ "from res_audio_Library a  "
 			+ "where a.status = 1 "
 			+ "<if test='form.resourceType != null' >"

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/authorlibrary/FgAuthorLabelContentDiyTypeMapper.java

@@ -14,7 +14,7 @@ import com.zrqx.core.vo.resource.fg.label.FgLabelInfoVO;
  */
 public interface FgAuthorLabelContentDiyTypeMapper extends BaseMapper<AuthorLibraryLabelContentDiyType> {
 	@Select("<script>"
-			+ "SELECT DISTINCT al.labelId, l.name, l.englishName, l.nationsType "
+			+ "SELECT al.labelId, l.name, l.englishName, l.nationsType "
 			+ "FROM res_author_library a "
 			+ "left join res_author_library_label_content_diy_type al ON a.id = al.authorId "
 			+ "left join res_label_content_diy_type lc on al.labelContentDiyTypeId = lc.id "
@@ -31,7 +31,7 @@ public interface FgAuthorLabelContentDiyTypeMapper extends BaseMapper<AuthorLibr
 	List<FgLabelInfoVO> queryLabelList(@Param("ids")List<String> ids);
 	
 	@Select("<script>"
-			+ "SELECT DISTINCT al.labelId, al.labelContentDiyTypeId id, lc.labelContent, lc.parentId, lc.englishName, lc.sort, al.labelContentDiyTypeCode code "
+			+ "SELECT al.labelId, al.labelContentDiyTypeId id, lc.labelContent, lc.parentId, lc.englishName, lc.sort, al.labelContentDiyTypeCode code "
 			+ "FROM res_author_library a "
 			+ "left join res_author_library_label_content_diy_type al ON a.id = al.authorId "
 			+ "left join res_label_content_diy_type lc on al.labelContentDiyTypeId = lc.id "

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/authorlibrary/FgAuthorLibraryDiytypeMapper.java

@@ -11,7 +11,7 @@ import com.zrqx.core.vo.resource.fg.diytype.FgDiyTypeVo;
 
 public interface FgAuthorLibraryDiytypeMapper extends BaseMapper<AuthorLibraryDiytype> {
 	@Select("<script>"
-			+ "select distinct dt.id, dt.parentId, dt.sort, dt.showName, dt.code "
+			+ "select dt.id, dt.parentId, dt.sort, dt.showName, dt.code "
 			+ "from res_Author_Library a "
 			+ "left join res_Author_Library_Diy_Type ad on a.id = ad.authorlibraryid "
 			+ "left join res_Diy_Type dt on ad.diytypeCode = dt.code "

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/authorlibrary/FgAuthorLibraryMapper.java

@@ -16,7 +16,7 @@ import com.zrqx.core.vo.resource.fg.authorlibrary.FgAuthorListVO;
 
 public interface FgAuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
 	@Select("<script>"
-			+ "select DISTINCT id,name,institutionName,sex,education,department,title,post,description,faceImg,uploadTime,browseNum "
+			+ "select id,name,institutionName,sex,education,department,title,post,description,faceImg,uploadTime,browseNum "
 			+ "FROM res_author_library   "
 			+ "where status = 1 "
 			+ "<if test='form.ids != null and form.ids.size > 0' >"
@@ -29,7 +29,7 @@ public interface FgAuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
 	List<FgAuthorLibraryListVO> queryOtherRecommendAuthor(@Param("form")FgQueryRecommedAuthorForm form);
 	
 	@Select("<script>"
-			+ "select DISTINCT id,name,institutionName,sex,education,department,title,post,description,faceImg,uploadTime,browseNum "
+			+ "select id,name,institutionName,sex,education,department,title,post,description,faceImg,uploadTime,browseNum "
 			+ "FROM res_author_library   "
 			+ "where status = 1 "
 			+ "<if test='ids != null and ids.size > 0' >"
@@ -55,7 +55,7 @@ public interface FgAuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
 	List<FgAuthorLibraryListVO> queryRecommendAuthor(@Param("form")FgQueryRecommedAuthorForm form);
 	
 	@Select("<script>"
-			+ "select DISTINCT id,name,institutionName,sex,education,department,title,post,description,faceImg,uploadTime,browseNum "
+			+ "select id,name,institutionName,sex,education,department,title,post,description,faceImg,uploadTime,browseNum "
 			+ "FROM res_author_library   "
 			+ "where status = 1 "
 			+ "<if test='ids != null and ids.size > 0' >"
@@ -68,7 +68,7 @@ public interface FgAuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
 	List<FgAuthorLibraryListVO> queryRecommendAuthorByIds(@Param("ids")List<String> ids);
 	
 	@Select("<script>"
-			+ "select DISTINCT a.id,a.name,a.institutionName,a.sex,a.education,a.department,a.title,a.post,a.description,a.faceImg,a.uploadTime,a.browseNum "
+			+ "select a.id,a.name,a.institutionName,a.sex,a.education,a.department,a.title,a.post,a.description,a.faceImg,a.uploadTime,a.browseNum "
 			+ "FROM res_author_library a "
 			+ "left join res_author_library_diy_type t "
 			+ "on a.id = t.authorlibraryid "
@@ -136,7 +136,7 @@ public interface FgAuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
 	 * @return
 	 */
 	@Select("<script>" 
-			+ "select distinct a.* "
+			+ "select a.* "
 			+ "from res_Author_Library a  "
 			+ "where a.status = 1 "
 			+ "<if test='form.ids != null and form.ids.size > 0' >"

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/courselibrary/FgCourseLibraryMapper.java

@@ -18,7 +18,7 @@ public interface FgCourseLibraryMapper extends BaseMapper<CourseLibrary> {
 	 * 获取推荐课程
 	 */
 	@Select("<script>" 
-			+ "select distinct a.* "
+			+ "select a.* "
 			+ "from res_Course_Library a  "
 			+ "where a.status = 1 "
 			+ "<if test='form.resourceType != null' >"

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/diytype/FgDiyTypeMapper.java

@@ -34,7 +34,7 @@ public interface FgDiyTypeMapper extends BaseMapper<DiyType>{
 	 * @date: 2019年3月5日 下午4:04:28
 	 */
 	@Select("<script>"
-			+ "select distinct dt.id, dt.parentId, dt.sort, dt.showName, dt.code " 
+			+ "select dt.id, dt.parentId, dt.sort, dt.showName, dt.code " 
 			+ "from res_Diy_Type dt "
 			+ "where 1=1 and dt.status = 1 "
 			+ "<if test='" +LIST_NOT_EMPTY + "(codes)'>"  

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/ebook/FgEbookDiyTypeMapper.java

@@ -16,7 +16,7 @@ import com.zrqx.core.vo.resource.fg.diytype.FgDiyTypeVo;
 public interface FgEbookDiyTypeMapper extends BaseMapper<EbookDiyType> {
 	
 	@Select("<script>"
-			+ "select distinct dt.id, dt.parentId, dt.sort, dt.showName, dt.code "
+			+ "select dt.id, dt.parentId, dt.sort, dt.showName, dt.code "
 			+ "FROM res_book bb "  
 			+ "LEFT JOIN res_ebook be ON bb.id = be.id "  
 			+ "left join res_ebook_diy_type bdt on be.id = bdt.ebookId "
@@ -38,7 +38,7 @@ public interface FgEbookDiyTypeMapper extends BaseMapper<EbookDiyType> {
 	 * @return
 	 */
 	@Select("<script>"
-			+ "select distinct rdt.id, rdt.parentId, rdt.sort, rdt.showName, rdt.code "
+			+ "select rdt.id, rdt.parentId, rdt.sort, rdt.showName, rdt.code "
 			+ "FROM res_Diy_Type rdt "    
 			+ "left join res_ebook_diy_type redt on rdt.id = redt.diyTypeId "
 			+ "where redt.ebookId = #{oid}"

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/ebook/FgEbookLabelContentDiyTypeMapper.java

@@ -14,7 +14,7 @@ import com.zrqx.core.vo.resource.fg.label.FgLabelInfoVO;
  */
 public interface FgEbookLabelContentDiyTypeMapper extends BaseMapper<EbookLabelContentDiyType> {
 	@Select("<script>"
-			+ "SELECT DISTINCT al.labelId, l.name, l.englishName, l.nationsType "
+			+ "SELECT al.labelId, l.name, l.englishName, l.nationsType "
 			+ "FROM res_ebook a "
 			+ "left join res_ebook_label_content_diy_type al ON a.id = al.ebookId "
 			+ "left join res_label_content_diy_type lc on al.labelContentDiyTypeId = lc.id "

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/ebook/FgEbookMapper.java

@@ -29,7 +29,7 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
 	 * @date 2018年12月20日 下午2:33:32
 	 */
 	@Select("<script>"
-			+ "select DISTINCT bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
+			+ "select bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
 			+ "bb.publishTime, bb.status, bb.resourceType, be.priceOption, be.realPrice,be.price,be.bookCover, be.summary, be.bookStatus, be.browseNum ,be.isContainEntity, be.entityRealPrice, be.entityPrice "
 			+ "FROM res_book bb "  
 	        + "LEFT JOIN res_ebook be ON bb.id = be.id " 
@@ -55,7 +55,7 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
 	 * @date 2018年12月20日 下午2:33:32
 	 */
 	@Select("<script>"
-			+ "select DISTINCT bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
+			+ "select bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
 			+ "bb.publishTime, bb.status, bb.nationsType, be.priceOption, be.price, be.realPrice, be.bookCover, be.summary, be.bookStatus, be.browseNum "
 			+ "FROM res_book bb "  
 	        + "LEFT JOIN res_ebook be ON bb.id = be.id "  
@@ -77,7 +77,7 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
 	 * @date 2019年1月24日 下午3:33:32
 	 */
 	@Select("<script>"
-			+ "select DISTINCT bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
+			+ "select bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
 			+ "bb.publishTime, bb.status, bb.resourceType, be.priceOption, be.price,be.realPrice, be.bookCover, be.summary, be.bookStatus, be.browseNum,be.isContainEntity, be.entityRealPrice, be.entityPrice "
 			+ "FROM res_book bb "  
 	        + "LEFT JOIN res_ebook be ON bb.id = be.id "
@@ -109,7 +109,7 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
 	 * @date 2019年1月24日 下午3:33:32
 	 */
 	@Select("<script>"
-			+ "select DISTINCT bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
+			+ "select bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
 			+ "bb.publishTime, bb.status, bb.nationsType, be.priceOption, be.price, be.realPrice, be.bookCover, be.summary, be.bookStatus, be.browseNum "
 			+ "FROM res_book bb "  
 	        + "LEFT JOIN res_ebook be ON bb.id = be.id "  
@@ -131,7 +131,7 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
 	 * @date: 2019年1月11日 下午3:50:49
 	 */
 	@Select("<script>"
-			+ "select DISTINCT bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
+			+ "select bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
 			+ "bb.publishTime, bb.status, bb.nationsType, be.realPrice, be.priceOption, be.price, be.bookCover, be.summary, be.bookStatus, be.browseNum, be.goodsType "
 			+ "FROM res_book bb "  
 	        + "LEFT JOIN res_ebook be ON bb.id = be.id "  
@@ -167,7 +167,7 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
 	 * @date: 2019年2月18日 下午1:49:56
 	 */
 	@Select("<script>"
-			+ "select DISTINCT bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
+			+ "select bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
 			+ "bb.publishTime, bb.status, bb.nationsType, be.price, be.priceOption, be.realPrice, be.bookCover, be.summary, be.bookStatus, be.browseNum, be.goodsType "
 			+ "FROM res_book bb "  
 	        + "LEFT JOIN res_ebook be ON bb.id = be.id "  
@@ -179,7 +179,7 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
 	List<FgEbookListVO> queryOtherEbook(FgQueryOtherEbookForm form);
 	
 	@Select("<script>"
-			+ "select DISTINCT bb.id, bb.name, "
+			+ "select bb.id, bb.name, "
 			+ "bb.publishTime, bb.status, bb.nationsType,bb.author, be.priceOption, be.price, be.realPrice, be.bookCover, be.bookStatus, be.browseNum,bb.resourceType "
 			+ "FROM res_book bb "  
 	        + "LEFT JOIN res_ebook be ON bb.id = be.id "  
@@ -201,7 +201,7 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
 	 * @date: 2019年3月1日 下午2:56:57
 	 */
 	@Select("<script>"
-			+ "select DISTINCT  bb.name "
+			+ "select  bb.name "
 			+ "FROM res_book bb "  
 	        + "LEFT JOIN res_ebook be ON bb.id = be.id "  
 			+ "where be.bookStatus = 4 "

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/imagelibrary/FgImageLibraryLabelContentDiyTypeMapper.java

@@ -15,7 +15,7 @@ import com.zrqx.core.vo.resource.fg.label.FgLabelInfoVO;
 public interface FgImageLibraryLabelContentDiyTypeMapper extends BaseMapper<ImageLibraryLabelContentDiyType> {
 
 	@Select("<script>"
-			+ "SELECT DISTINCT al.labelId, l.name, l.englishName, l.nationsType "
+			+ "SELECT al.labelId, l.name, l.englishName, l.nationsType "
 			+ "FROM res_image_library a "
 			+ "left join res_image_library_label_content_diy_type al ON a.id = al.imageId "
 			+ "left join res_label_content_diy_type lc on al.labelContentDiyTypeId = lc.id "

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/label/FgLabelMapper.java

@@ -20,7 +20,7 @@ public interface FgLabelMapper extends BaseMapper<Label>{
 	 * @date: 2019年1月11日 上午9:17:35
 	 */
 	@Select("<script>"
-			+ "select distinct l.id labelId,l.name,l.englishName,l.nationsType "
+			+ "select l.id labelId,l.name,l.englishName,l.nationsType "
 			+ " from res_label l "
 			+ " left join res_label_data_type ld "
 			+ " on l.id = ld.labelId "
@@ -41,7 +41,7 @@ public interface FgLabelMapper extends BaseMapper<Label>{
 	 * @date: 2019年3月27日 下午3:00:38
 	 */
 	@Select("<script>"
-			+ "select distinct l.id labelId,l.name,l.englishName "
+			+ "select l.id labelId,l.name,l.englishName "
 			+ " from res_label l "
 			+ " where l.id in (SELECT labelId FROM res_label_data_type GROUP BY labelId HAVING COUNT(*) =5 ) "
 			+ "</script>")

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/projectlibrary/FgProjectLibraryMapper.java

@@ -19,7 +19,7 @@ public interface FgProjectLibraryMapper extends BaseMapper<ProjectLibrary> {
 	 * 获取推荐专题
 	 */
 	@Select("<script>" 
-			+ "select distinct a.* "
+			+ "select a.* "
 			+ "from res_Project_Library a  "
 			+ "where a.status = 1 "
 			+ "<if test='form.resourceType != null' >"
@@ -46,7 +46,7 @@ public interface FgProjectLibraryMapper extends BaseMapper<ProjectLibrary> {
 	 * @return
 	 */
 	@Select("<script>" 
-			+ "select distinct a.* "
+			+ "select a.* "
 			+ "from res_Project_Library a  "
 			+ "where a.status = 1 "
 			+ "<if test='form.resourceType != null' >"
@@ -67,7 +67,7 @@ public interface FgProjectLibraryMapper extends BaseMapper<ProjectLibrary> {
 	 * @return
 	 */
 	@Select("<script>" 
-			+ "select distinct b.isbn,c.name,c.bookCover,c.realPrice,b.authorId,b.author,b.resourceType,c.id "
+			+ "select b.isbn,c.name,c.bookCover,c.realPrice,b.authorId,b.author,b.resourceType,c.id "
 			+ "from res_resource_relation a "
 			+ "left join res_book b "
 			+ "on a.resourceId = b.id "

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/recommend/FgRecommendResourceMapper.java

@@ -22,7 +22,7 @@ public interface FgRecommendResourceMapper extends BaseMapper<RecommendResource>
 	 * @date: 2018年12月18日上午9:05:21
 	 */
 	@Select(" <script> "
-			+ " SELECT distinct rg.id, rg.recomId, rg.resName, rg.resImg, rg.resId,rg.resType,rg.sort "
+			+ " SELECT rg.id, rg.recomId, rg.resName, rg.resImg, rg.resId,rg.resType,rg.sort "
 			+ " FROM res_recommend_resource rg "
 			+ " WHERE rg.recomId = #{re.recomId} "
 			+ " and rg.status = 1 "

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/videolibrary/FgVideoLibraryLabelContentDiyTypeMapper.java

@@ -15,7 +15,7 @@ import com.zrqx.core.vo.resource.fg.label.FgLabelInfoVO;
 public interface FgVideoLibraryLabelContentDiyTypeMapper extends BaseMapper<VideoLibraryLabelContentDiyType> {
 
 	@Select("<script>"
-			+ "SELECT DISTINCT al.labelId, l.name, l.englishName, l.nationsType "
+			+ "SELECT al.labelId, l.name, l.englishName, l.nationsType "
 			+ "FROM res_video_library a "
 			+ "left join res_video_library_label_content_diy_type al ON a.id = al.videoId "
 			+ "left join res_label_content_diy_type lc on al.labelContentDiyTypeId = lc.id "
@@ -32,7 +32,7 @@ public interface FgVideoLibraryLabelContentDiyTypeMapper extends BaseMapper<Vide
 	List<FgLabelInfoVO> queryLabelList(@Param("ids")List<String> ids);
 	
 	@Select("<script>"
-			+ "SELECT DISTINCT al.labelId, al.labelContentDiyTypeId id, lc.labelContent, lc.parentId, lc.englishName, lc.sort, al.labelContentDiyTypeCode code "
+			+ "SELECT  al.labelId, al.labelContentDiyTypeId id, lc.labelContent, lc.parentId, lc.englishName, lc.sort, al.labelContentDiyTypeCode code "
 			+ "FROM res_video_library a "
 			+ "left join res_video_library_label_content_diy_type al ON a.id = al.videoId "
 			+ "left join res_label_content_diy_type lc on al.labelContentDiyTypeId = lc.id "

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/videolibrary/FgVideoLibraryMapper.java

@@ -18,7 +18,7 @@ public interface FgVideoLibraryMapper extends BaseMapper<VideoLibrary> {
 	 * 获取推荐视频
 	 */
 	@Select("<script>" 
-			+ "select distinct a.* "
+			+ "select a.* "
 			+ "from res_video_Library a  "
 			+ "where a.status = 1 "
 			+ "<if test='form.resourceType != null' >"
@@ -45,7 +45,7 @@ public interface FgVideoLibraryMapper extends BaseMapper<VideoLibrary> {
 	 * @return
 	 */
 	@Select("<script>" 
-			+ "select distinct a.* "
+			+ "select a.* "
 			+ "from res_video_Library a  "
 			+ "where a.status = 1 "
 			+ "<if test='form.resourceType != null' >"