,

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

@@ -16,6 +16,7 @@ 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;
@@ -50,7 +51,7 @@ public class StorageDeviceCheckController {
 
         StorageDevicecheckExample storageDevicecheckExample=new StorageDevicecheckExample();
         StorageDevicecheckExample.Criteria criteria= storageDevicecheckExample.createCriteria();
-    	if(ParameterUtil.isnotnull(pdNum)) criteria.andCheckNumberLike("%"+pdNum+"%");
+    	if(StringUtils.isNotBlank(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,6 +9,7 @@ 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;
@@ -75,19 +76,17 @@ public class StorageDeviceGetController {
     	StorageDevicegetExample storageDevicegetExample=new StorageDevicegetExample(); 
     	StorageDevicegetExample.Criteria criteria=storageDevicegetExample.createCriteria();
     	
-    	if(ParameterUtil.isnotnull(deviceName)){
-            criteria.andDeviceNameLike(deviceName);
-        }
-        if(ParameterUtil.isnotnull(deviceType)){
-        	criteria.andDeviceTypeEqualTo(deviceType);
-        }
+    	if(deviceType!=null){
+    		criteria.andDeviceTypeEqualTo(deviceType);
+    	}
+    	if(StringUtils.isNotBlank(deviceName)){
+    		criteria.andDeviceNameLike(deviceName);
+    	}
+    	
         //按照id进行降序
         storageDevicegetExample.setOrderByClause("id desc");
    
-        if (pageNum!=null && pageSize!=null) {
-            PageHelper.startPage(pageNum, pageSize);
-        }
-        
+        PageHelper.startPage(pageNum, pageSize);
         List<StorageDeviceget> list = deviceGetService.queryByDevice(storageDevicegetExample);
        
         for (StorageDeviceget storageDeviceget : list) {

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

@@ -12,6 +12,7 @@ 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;
@@ -60,15 +61,17 @@ public class StorageDeviceKeepController {
 
     	StorageDevicekeepExample storageDevicekeepExample=new StorageDevicekeepExample();
     	StorageDevicekeepExample.Criteria criteria=storageDevicekeepExample.createCriteria();
-    	if(ParameterUtil.isnotnull(deviceName)){
-            criteria.andDeviceNameLike(deviceName);
-        }
-       if(ParameterUtil.isnotnull(keepStatus)){
-        	criteria.andKeepStatusEqualTo(keepStatus);
-        }
-        if(ParameterUtil.isnotnull(orgId)){
+       
+        if(orgId!=null){
         	criteria.andOrgIdEqualTo(orgId);
         }
+    	if(keepStatus!=null){
+    		criteria.andKeepStatusEqualTo(keepStatus);
+    	}
+    	if(StringUtils.isNotBlank(deviceName)){
+    		criteria.andDeviceNameLike(deviceName);
+    	}
+    	
 
         //排序
         storageDevicekeepExample.setOrderByClause("FIELD(keep_status,1,0), keep_end desc , id desc");

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(ParameterUtil.isnotnull(repairStatus)){
+        if(repairStatus!=null){
         	criteria.andRepairStatusEqualTo(repairStatus);
         }