--no commit message

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/content/SignLanguageMapper.java

@@ -63,11 +63,14 @@ public interface SignLanguageMapper extends BaseMapper<SignLanguage> {
 			+ "</script>")
 	List<SignLanguageListVo> pageOrUserType4(@Param("form")LanguageORUserSelectForm form);
 	@Select("<script>" 
-			+ "SELECT s.title,c.text as content,s.founder,s.distributor,DATE_FORMAT(s.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,DATE_FORMAT(s.completeTime,'%Y-%m-%d %H:%i:%s') completeTime,"
-			+ "s.`status` FROM sys_sign_language s LEFT JOIN sys_content_relation re on s.id=re.objectId LEFT JOIN sys_content c on c.id=re.contentId where 1=1"  
+			+ "SELECT distinct s.id,s.title,s.founder,s.founderId,s.distributor,s.complete,s.status,"
+			+ "DATE_FORMAT(s.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,sl.id as signUserId,"
+			+ "DATE_FORMAT(s.completeTime,'%Y-%m-%d %H:%i:%s') completeTime FROM sys_sign_language s "
+			+ "LEFT JOIN sys_sign_language_user_relation sl on sl.objectId=s.id where 1=1 "
 			+ "<if test='"+ NOTBLANK +"(form.title)'>"
-    		+ " and (s.title like concat('%',#{form.title},'%') or c.text like concat('%',#{form.title},'%'))"
+    		+ " and (s.title like concat('%',#{form.title},'%') or s.content like concat('%',#{form.title},'%') )"
     		+ "</if>"
+    		+ " GROUP BY s.title"
 			+ "</script>")
 	List<SignLanguageExcelListVO> exportBookList(@Param("form")LanguageExportForm form);
 	//SELECT distinct * FROM sys_sign_language s LEFT JOIN sys_content_relation re on s.id=re.objectId LEFT JOIN sys_content c on c.id=re.contentId where c.text like '%咖啡种类%' and s.title like '%12月20日任务演示%'