--no commit message

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

@@ -82,7 +82,7 @@ public class FgWorkmanagementController {
 		return CallBack.success(workmanagementService.page(form, pageParam));
 	}
 	
-	@ApiOperation("查询作品列表")
+	@ApiOperation("查询投票作品列表")
 	@GetMapping(ResourceRequestPath.LIST)
 	public CallBack<List<FgWorkmanagementListVo>> getWorkBookList(FgWorkmanagementForm form, PageParam pageParam) {
 		return CallBack.success(workmanagementService.list(form, pageParam));

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

@@ -32,7 +32,7 @@ public interface FgWorkManagementMapper extends BaseMapper<WorkManagement>{
 	 * @date 2020年7月15日 下午2:33:32
 	 */
 	@Select("<script>"
-		    + " select DISTINCT be.id,be.number,be.voteNum,name,companytype,"
+		    + " select DISTINCT be.id,ifnull(be.number,0),ifnull(be.voteNum,0),name,companytype,"
 		    + " serieschinesename,"
 		    + " (select cover from res_work_management_img b where imgtype ='2' and b.workWorkId = (select id from res_work_management_work a where a.workId = be.id and imgsort = 1 ) LIMIT 1) cover   "
 		    + " from res_work_management be LEFT JOIN res_work_management_diy_type bdt ON be.id = bdt.workId  "