--no commit message

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

@@ -90,8 +90,11 @@ public interface SignLanguageMapper extends BaseMapper<SignLanguage> {
 			+ "</script>")	
 	List<SignLanguageRelationListVo> relation_page(@Param("form")LanguageSelectForm form);
 	@Select("<script>" 
-			+"SELECT distinct s.id,s.title,DATE_FORMAT(s.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,s.content FROM sys_sign_language s " 
-			+"LEFT JOIN sys_sign_language_user_relation sl on sl.objectId=s.id "
+			+ "SELECT distinct s.id,sl.id as signUserId,s.title,s.founder,s.founderId,s.distributor,s.complete,re.status,"  
+			+ "DATE_FORMAT(s.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,sl.role,"  
+			+ "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 "
+			/*+ "LEFT JOIN sys_sign_language_relation re on re.objectId=s.id where 1=1 and re.status!=1"*/
 			+ "LEFT JOIN sys_sign_language_relation re on re.objectId=s.id where 1=1 and re.status!=1 "
 			+ "<if test='"+ NOTBLANK +"(form.title)'>"
     		+ " and (s.title like concat('%',#{form.title},'%')  or s.content like concat('%',#{form.title},'%'))"
@@ -112,7 +115,7 @@ public interface SignLanguageMapper extends BaseMapper<SignLanguage> {
 	    		+ " and sl.userId = #{form.userId} "
 	    		+ "</if>"
     		+ "</if>"
-    		+ " GROUP BY s.title "
+    		+ " GROUP BY s.title"
     		+ "</script>")	
 	List<SignLanguageRelationListVo> relation_pageOrUser(@Param("form")LanguageSelectForm form);
 	@Select("<script>"