--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/paperLibrary/PaperLibraryService.java

@@ -2,6 +2,7 @@ package com.zrqx.resource.bg.service.paperLibrary;
 
 import java.util.List;
 
+import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
 import com.zrqx.core.form.resource.bg.paperLibrary.QueryPaperLibraryForm;
 import com.zrqx.core.form.resource.bg.paperLibrary.SaveUpdatePaperLibraryForm;
 import com.zrqx.core.model.resource.paperLibrary.PaperLibrary;
@@ -21,4 +22,5 @@ public interface PaperLibraryService extends BaseService<PaperLibrary, Integer>
 	/** 分页查询 */
 	PageInfo<PaperLibraryListVo> page(QueryPaperLibraryForm form, PageParam pageParam);
 
+	PageInfo<PaperLibraryListVo> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/paperLibrary/PaperLibraryServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -14,6 +15,7 @@ import com.zrqx.core.enums.ResponseCodeEnum;
 import com.zrqx.core.exception.BaseException;
 import com.zrqx.core.form.recyclebin.SaveResourceForm;
 import com.zrqx.core.form.resource.bg.BatchUpdateForm;
+import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
 import com.zrqx.core.form.resource.bg.paperLibrary.QueryPaperLibraryForm;
 import com.zrqx.core.form.resource.bg.paperLibrary.SaveUpdatePaperLibraryForm;
 import com.zrqx.core.mapper.BaseMapper;
@@ -169,4 +171,14 @@ public class PaperLibraryServiceImpl extends BaseServiceImpl<PaperLibrary, Integ
 		List<PaperLibraryListVo> list = mapper.query(form);
 		return new PageInfo<PaperLibraryListVo>(list);
 	}
+	
+	@Override
+	public PageInfo<PaperLibraryListVo> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam) {
+		if(pageParam != null && StringUtils.isNotBlank(pageParam.getOrderBy())){
+			pageParam.setOrderBy("uploadTime desc");
+		}
+		startPage(pageParam);
+		List<PaperLibraryListVo> list = mapper.queryByTileAndDiyType(form);
+		return new PageInfo<PaperLibraryListVo>(list);
+	}
 }