--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/workmanagement/FgWorkmanagementController.java

@@ -101,6 +101,9 @@ public class FgWorkmanagementController {
 		if (vo.getFabulousNum() == null) {
 			vo.setFabulousNum(0);
 		}
+		if (vo.getVoteNum() == null) {
+			vo.setVoteNum(0);
+		}
 		// 设置是否已点赞
 		vo.setIsAgree(Integer.parseInt(BooleanStatusEnum.NO.getCode()));
 		if (redisManage.isExistMember()) {
@@ -186,6 +189,7 @@ System.out.println(form.getIds());
 		} else {
 			throw new BusinessValidateException("请您先登录");
 		}
+		System.out.println(redisManage.getMember().getId());
 		//今天是否投过票
 		fgWorkVoteService.selectWorkVote();
 		for (String id : form.getIds()) {

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

@@ -45,7 +45,7 @@ public interface FgWorkManagementMapper extends BaseMapper<WorkManagement>{
 			+ "<if test='"+ NOTBLANK +"(form.diyTypeCode)' >"  
 		    + " and bdt.code like concat(#{form.diyTypeCode},'%') "
 			+ "</if>" 
-		    + " ORDER BY  voteNum desc"
+		    + " "
 			+ "</script>")
 	List<FgWorkmanagementListVo> page(@Param("form")FgWorkmanagementForm form);