--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/workmanagement/WorkmanagementController.java

@@ -68,8 +68,8 @@ public class WorkmanagementController {
 
 	@ApiOperation("查询作品列表")
 	@PostMapping(ResourceRequestPath.PAGE)
-	public CallBack<PageInfo<WorkmanagementListVo>> getBookList(@RequestBody WorkmanagementForm form) {
-		return CallBack.success(workmanagementService.page(form, form.getPageParam()));
+	public CallBack<PageInfo<WorkmanagementListVo>> getBookList(@RequestBody WorkmanagementForm form,PageParam pageParam) {
+		return CallBack.success(workmanagementService.page(form,pageParam));
 	}
 
 	@ApiOperation("保存作品")

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

@@ -69,7 +69,7 @@ public interface WorkManagementMapper extends BaseMapper<WorkManagement>{
 			+ "</foreach>"
 			+ ")"
 			+ "</if>" 
-		    + " ORDER BY uploadTime desc"
+		    + "  "
 			+ "</script>")
 	List<WorkmanagementListVo> page(@Param("form")WorkmanagementForm form);
 	

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/workmanagement/WorkManagementService.java

@@ -26,7 +26,7 @@ public interface WorkManagementService extends BaseService<WorkManagement, Strin
 	 * @author rjy
 	 * @date: 2020年07月13日 下午2:39:32
 	 */
-	PageInfo<WorkmanagementListVo> page(WorkmanagementForm form, PageParam pageParam);
+	PageInfo<WorkmanagementListVo> page(WorkmanagementForm form,PageParam pageParam);
 	
 	/**
 	 * 保存或修改

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/workmanagement/WorkManagementServiceImpl.java

@@ -61,7 +61,9 @@ public class WorkManagementServiceImpl extends BaseServiceImpl<WorkManagement, S
 	}
 
 	@Override
-	public PageInfo<WorkmanagementListVo> page(WorkmanagementForm form, PageParam pageParam) {
+	public PageInfo<WorkmanagementListVo> page(WorkmanagementForm form,PageParam pageParam) {
+		pageParam.setPageNum(form.getPageNum());
+		pageParam.setPageSize(form.getPageSize());
 		if (pageParam.getOrderBy() == null) {
 			pageParam.setOrderBy(" uploadTime desc ");
 		}

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

@@ -108,6 +108,9 @@ public class FgWorkmanagementController {
 		FgWorkManagementVo vo = new FgWorkManagementVo();
 		WorkManagement workManagement = workmanagementService.selectByPrimaryKey(oid);
 		BeanUtils.copyProperties(workManagement, vo);
+		if(vo.getFabulousNum()== null) {
+			vo.setFabulousNum(0);
+		}
 		// 设置是否已点赞
 		vo.setIsAgree(Integer.parseInt(BooleanStatusEnum.NO.getCode()));
 		if (redisManage.isExistMember()) {