入库分页

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceInputController.java

@@ -24,6 +24,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 
+import org.apache.commons.lang.StringUtils;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -63,20 +65,18 @@ public class StorageDeviceInputController {
     public PageInfo<StorageDeviceinput> getList(HttpServletRequest request,Integer pageNum, Integer pageSize, String deviceName, Integer deviceType ,String orgName) throws Exception{
     	StorageDeviceinputExample storageDeviceinputExample=new StorageDeviceinputExample();
     	StorageDeviceinputExample.Criteria criteria=storageDeviceinputExample.createCriteria();
-    	if(ParameterUtil.isnotnull(deviceType)){
+    	if(deviceType!=null){
     		criteria.andDeviceTypeEqualTo(deviceType);
     	}
-    	if(ParameterUtil.isnotnull(deviceName)){
+    	if(StringUtils.isNotBlank(deviceName)){
     		criteria.andDeviceNameLike(deviceName);
     	}
 
         //排序
-        storageDeviceinputExample.setOrderByClause("FIELD(status,0,1),input_time desc,id desc");
-   
-        if (pageNum!=null && pageSize!=null) {
-            PageHelper.startPage(pageNum, pageSize);
-        }
+        //storageDeviceinputExample.setOrderByClause("FIELD(status,0,1),input_time desc,id desc");
+        storageDeviceinputExample.setOrderByClause("id desc");
         
+        PageHelper.startPage(pageNum, pageSize);
         List<StorageDeviceinput> list = deviceInputService.queryByDevice(storageDeviceinputExample);
          for (StorageDeviceinput storageDeviceinput : list) {
         	 if(orgName!=null){
@@ -90,6 +90,7 @@ public class StorageDeviceInputController {
 
         	 }
 		}
+        
         PageInfo<StorageDeviceinput> pageInfo = new PageInfo<StorageDeviceinput>(list);
         return pageInfo;
     }