--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/workmanagement/WorkManagementMapper.java

@@ -35,9 +35,10 @@ public interface WorkManagementMapper extends BaseMapper<WorkManagement>{
 		    + " select DISTINCT be.id,be. number,be.voteNum,( select GROUP_CONCAT(typename) from res_diy_type a where a.code in (select db.code from  res_work_management_diy_type db where be.id = db.workId)) diyType,name,company,phone,case when companytype = 1 then '单项作品' else '系列作品' end companytype,"
 		    + " serieschinesename,workstatus,case when workstatus = 1 then '上线' else '下线' end status_zh,"
 		   
-		    + " cover from res_work_management be join res_work_management_work bc on be.id =bc.workid join res_work_management_diy_type bdt ON be.id = bdt.workId join res_work_management_img im on bc.id=im.workWorkId "
+		    + "(select cover from res_work_management_img b where imgtype ='2' and b.workWorkId = bc.id LIMIT 1) cover "
+		    + "from res_work_management be left  join res_work_management_work bc on be.id =bc.workid left join res_work_management_diy_type bdt ON be.id = bdt.workId  "
 		    
-		    + " where 1=1 and im.imgtype ='2' and bc.imgsort = 1 group by id"
+		    + " where 1=1  and bc.imgsort = 1 "
 		    + "<if test='"+ NOTBLANK +"(form.text)' >"  
 			+ "<if test='form.type==1'>"
 			+ " AND serieschinesename like concat( '%',#{form.text},'%') "

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/workmanagement/FgWorkManagementMapper.java

@@ -33,7 +33,7 @@ public interface FgWorkManagementMapper extends BaseMapper<WorkManagement>{
 	 */
 	@Select("<script>"
 		    + " select  DISTINCT a.id,ifnull(a.number,0) number,a.company,ifnull(a.voteNum,0) voteNum,a.name,a.companytype," + 
-		    "  a.serieschinesename, cover from res_work_management a join res_work_management_work b on a.id =b.workid join res_work_management_diy_type d ON a.id = d.workId join res_work_management_img c on b.id=c.workWorkId where b.imgsort = 1 and c.imgtype ='2' and a.workStatus=1 "
+		    "  a.serieschinesename, cover from res_work_management a left join res_work_management_work b on a.id =b.workid left join res_work_management_diy_type d ON a.id = d.workId join res_work_management_img c on b.id=c.workWorkId where b.imgsort = 1 and c.imgtype ='2' and a.workStatus=1 "
 			
 			+ "<if test='"+ NOTBLANK +"(form.serieschinesename)' >"  
 		    + " and serieschinesename like concat('%',#{form.serieschinesename},'%') "

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/workmanagement/FgWorkVoteServiceImpl.java

@@ -36,7 +36,7 @@ public class FgWorkVoteServiceImpl extends BaseServiceImpl<WorkVote, String>
 	public WorkVote selectWorkVote() {
 		WorkVote workvote = fgWorkVoteMapper.selectVote(redisManage.getMember().getId());
 		if(workvote != null) {
-			throw new BusinessValidateException(2,"您已投票，请您明天在为您喜欢的作品投票");
+			throw new BusinessValidateException(2,"您已投票，请您明天再为您喜欢的作品投票");
 		}
 		return null;
 	}