信息查询不到问题处理

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

@@ -46,13 +46,16 @@ public class StorageDeviceCheckController {
   			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
   			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query")
   	})
-    public PageInfo<StorageDevicecheck> listCheckPage(Integer pageNum, Integer pageSize, String pdNum,String starttime,String endtime) throws Exception{
+    public PageInfo<StorageDevicecheck> listCheckPage(Integer pageNum, Integer pageSize, String pdNum,String starttime,String endtime,Integer orgId) throws Exception{
 
         StorageDevicecheckExample storageDevicecheckExample=new StorageDevicecheckExample();
         StorageDevicecheckExample.Criteria criteria= storageDevicecheckExample.createCriteria();
         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"));
+        if(ParameterUtil.isnotnull(orgId)){
+            criteria.andOrgIdEqualTo(orgId);
+        }
         //按照id进行降序
         storageDevicecheckExample.setOrderByClause("id desc");
         if (pageNum!=null && pageSize!=null) PageHelper.startPage(pageNum, pageSize);

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

@@ -68,8 +68,8 @@ public class StorageDeviceGetController {
   			@ApiImplicitParam(name = "orgName", value = "当前登录人组织名称", paramType = "query"),
 			@ApiImplicitParam(name = "deviceName", value = "设备名称", paramType = "query")
   	})
-    public PageInfo<StorageDeviceget> listCheckPage(HttpServletRequest request,Integer pageNum, Integer pageSize, 
-    		String deviceName, Integer deviceType){
+    public PageInfo<StorageDeviceget> listCheckPage(Integer pageNum, Integer pageSize,
+    		String deviceName, Integer deviceType, Integer orgId){
     	
     	StorageDevicegetExample storageDevicegetExample=new StorageDevicegetExample(); 
     	StorageDevicegetExample.Criteria criteria=storageDevicegetExample.createCriteria();
@@ -80,6 +80,9 @@ public class StorageDeviceGetController {
         if(ParameterUtil.isnotnull(deviceType)){
            criteria.andDeviceTypeEqualTo(deviceType);
         }
+		if(ParameterUtil.isnotnull(orgId)){
+			criteria.andOrgIdEqualTo(orgId);
+		}
         
     	
         //按照id进行降序

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

@@ -62,7 +62,7 @@ public class StorageDeviceInputController {
   			@ApiImplicitParam(name = "orgName", value = "当前登录人组织名称", paramType = "query"),
 			@ApiImplicitParam(name = "deviceName", value = "设备名称", paramType = "query")
   	})
-    public PageInfo<StorageDeviceinput> getList(HttpServletRequest request,Integer pageNum, Integer pageSize, String deviceName, Integer deviceType) throws Exception{
+    public PageInfo<StorageDeviceinput> getList(Integer pageNum, Integer pageSize, String deviceName, Integer deviceType, Integer orgId) throws Exception{
     	StorageDeviceinputExample storageDeviceinputExample=new StorageDeviceinputExample();
     	StorageDeviceinputExample.Criteria criteria=storageDeviceinputExample.createCriteria();
     	if(ParameterUtil.isnotnull(deviceType)){
@@ -71,6 +71,9 @@ public class StorageDeviceInputController {
     	if(ParameterUtil.isnotnull(deviceName)){
     		criteria.andDeviceNameLike(deviceName);
     	}
+    	if(ParameterUtil.isnotnull(orgId)){
+    		criteria.andOrgIdEqualTo(orgId);
+    	}
 
         //排序
         //storageDeviceinputExample.setOrderByClause("FIELD(status,0,1),input_time desc,id desc");
@@ -249,7 +252,7 @@ public class StorageDeviceInputController {
   			@ApiImplicitParam(name = "orgName", value = "当前登录人组织名称", paramType = "query"),
 			@ApiImplicitParam(name = "deviceName", value = "设备名称", paramType = "query")
   	})
-    public PageInfo<StorageDeviceinput> getDeviceAccountList(HttpServletRequest request,Integer pageNum, Integer pageSize, Integer deviceType ,String orgName,String deviceName) throws Exception{
+    public PageInfo<StorageDeviceinput> getDeviceAccountList(Integer pageNum, Integer pageSize, Integer deviceType ,String orgName, Integer orgId, String deviceName) throws Exception{
     	StorageDeviceinputExample storageDeviceinputExample=new StorageDeviceinputExample();
     	StorageDeviceinputExample.Criteria criteria=storageDeviceinputExample.createCriteria();
     	if(ParameterUtil.isnotnull(deviceType)){
@@ -258,6 +261,9 @@ public class StorageDeviceInputController {
 		if(ParameterUtil.isnotnull(deviceName)){
 			criteria.andDeviceNameLike(deviceName);
 		}
+		if(ParameterUtil.isnotnull(orgId)){
+			criteria.andOrgIdEqualTo(orgId);
+		}
         //排序
         storageDeviceinputExample.setOrderByClause("FIELD(status,0,1),input_time desc,id desc");