。。

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

@@ -16,7 +16,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
-import org.apache.commons.lang.StringUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -51,7 +50,7 @@ public class StorageDeviceCheckController {
 
         StorageDevicecheckExample storageDevicecheckExample=new StorageDevicecheckExample();
         StorageDevicecheckExample.Criteria criteria= storageDevicecheckExample.createCriteria();
-    	if(StringUtils.isNotBlank(pdNum)) criteria.andCheckNumberLike("%"+pdNum+"%");
+        if(ParameterUtil.isnotnull(pdNum)) criteria.andCheckNumberLike("%"+pdNum+"%");
        if(ParameterUtil.isnotnull(starttime)) criteria.andCheckDateGreaterThanOrEqualTo(ParameterUtil.string2datetime(starttime+" 00:00:00"));
        if(ParameterUtil.isnotnull(endtime)) criteria.andCheckDateLessThanOrEqualTo(ParameterUtil.string2datetime(endtime+" 00:00:00"));
         //按照id进行降序

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

@@ -9,7 +9,6 @@ import java.util.Map;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.StringUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -74,12 +73,13 @@ public class StorageDeviceGetController {
     	StorageDevicegetExample storageDevicegetExample=new StorageDevicegetExample(); 
     	StorageDevicegetExample.Criteria criteria=storageDevicegetExample.createCriteria();
     	
-    	if(deviceType!=null){
-    		criteria.andDeviceTypeEqualTo(deviceType);
-    	}
-    	if(StringUtils.isNotBlank(deviceName)){
-    		criteria.andDeviceNameLike(deviceName);
-    	}
+    	if(ParameterUtil.isnotnull(deviceName)){
+            criteria.andDeviceNameLike(deviceName);
+        }
+        if(ParameterUtil.isnotnull(deviceType)){
+           criteria.andDeviceTypeEqualTo(deviceType);
+        }
+        
     	
         //按照id进行降序
         storageDevicegetExample.setOrderByClause("id desc");

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

@@ -24,7 +24,6 @@ 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;
@@ -65,10 +64,10 @@ public class StorageDeviceInputController {
     public PageInfo<StorageDeviceinput> getList(HttpServletRequest request,Integer pageNum, Integer pageSize, String deviceName, Integer deviceType) throws Exception{
     	StorageDeviceinputExample storageDeviceinputExample=new StorageDeviceinputExample();
     	StorageDeviceinputExample.Criteria criteria=storageDeviceinputExample.createCriteria();
-    	if(deviceType!=null){
+    	if(ParameterUtil.isnotnull(deviceType)){
     		criteria.andDeviceTypeEqualTo(deviceType);
     	}
-    	if(StringUtils.isNotBlank(deviceName)){
+    	if(ParameterUtil.isnotnull(deviceName)){
     		criteria.andDeviceNameLike(deviceName);
     	}
 
@@ -76,7 +75,9 @@ public class StorageDeviceInputController {
         //storageDeviceinputExample.setOrderByClause("FIELD(status,0,1),input_time desc,id desc");
         storageDeviceinputExample.setOrderByClause("id desc");
         
-        PageHelper.startPage(pageNum, pageSize);
+        if (pageNum!=null && pageSize!=null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
         List<StorageDeviceinput> list = deviceInputService.queryByDevice(storageDeviceinputExample);
         PageInfo<StorageDeviceinput> pageInfo = new PageInfo<StorageDeviceinput>(list);
         return pageInfo;

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

@@ -12,7 +12,6 @@ import java.util.Map;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.StringUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -62,15 +61,15 @@ public class StorageDeviceKeepController {
     	StorageDevicekeepExample storageDevicekeepExample=new StorageDevicekeepExample();
     	StorageDevicekeepExample.Criteria criteria=storageDevicekeepExample.createCriteria();
        
-        if(orgId!=null){
+    	if(ParameterUtil.isnotnull(deviceName)){
+            criteria.andDeviceNameLike(deviceName);
+        }
+        if(ParameterUtil.isnotnull(keepStatus)){
+           criteria.andKeepStatusEqualTo(keepStatus);
+        }
+        if(ParameterUtil.isnotnull(orgId)){
         	criteria.andOrgIdEqualTo(orgId);
         }
-    	if(keepStatus!=null){
-    		criteria.andKeepStatusEqualTo(keepStatus);
-    	}
-    	if(StringUtils.isNotBlank(deviceName)){
-    		criteria.andDeviceNameLike(deviceName);
-    	}
     	
 
         //排序

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

@@ -59,7 +59,7 @@ public class StorageDeviceRepairController {
     	StorageDevicerepairExample storageDevicerepairExample=new StorageDevicerepairExample();
     	StorageDevicerepairExample.Criteria criteria=storageDevicerepairExample.createCriteria();
     	
-        if(repairStatus!=null){
+    	if(ParameterUtil.isnotnull(repairStatus)){
         	criteria.andRepairStatusEqualTo(repairStatus);
         }