.

src/main/java/com/chinaitop/agile/controller/RegistrationController.java

@@ -9,6 +9,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -48,10 +49,11 @@ public class RegistrationController {
         @ApiImplicitParam(name = "houseId", value = "仓房id", paramType = "query"),
         @ApiImplicitParam(name = "warehouseId", value = "货位id", paramType = "query"),
         @ApiImplicitParam(name = "startDate", value = "开始时间", paramType = "query"),
-		@ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query")
+		@ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query"),
+		@ApiImplicitParam(name = "orgId", value = "组织机构ID", paramType = "query")
 	})
     public PageInfo<Map<String,Object>> getWheatListPageInfo(HttpServletRequest request, Integer pageNum, Integer pageSize,
-    		String houseId, String warehouseId, String startDate, String endDate){
+    		String houseId, String warehouseId, String startDate, String endDate, String orgId){
     	Map<String,Object> map = new HashMap<String,Object>();
     	PageInfo<Map<String,Object>> pageInfo = null;
 		try {
@@ -62,8 +64,10 @@ public class RegistrationController {
 				map.put("warehouseId", warehouseId);
 			}
 
-			map.put("orgId", request.getSession().getAttribute("orgId"));
-			
+			if (StringUtils.isNotBlank(orgId)) {
+				map.put("orgId", orgId);
+			}
+
 			if (null != startDate && !"".equals(startDate)) {
 				map.put("startDate", startDate);
 			}
@@ -97,10 +101,11 @@ public class RegistrationController {
 		@ApiImplicitParam(name = "houseId", value = "仓房id", paramType = "query"),
 		@ApiImplicitParam(name = "warehouseId", value = "货位id", paramType = "query"),
 		@ApiImplicitParam(name = "startDate", value = "开始时间", paramType = "query"),
-		@ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query")
+		@ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query"),
+		@ApiImplicitParam(name = "orgId", value = "组织机构ID", paramType = "query")
 	})
 	public PageInfo<Map<String,Object>> getCornListPageInfo(HttpServletRequest request, Integer pageNum, Integer pageSize,
-			String houseId, String warehouseId, String startDate, String endDate){
+			String houseId, String warehouseId, String startDate, String endDate, String orgId){
 		Map<String,Object> map = new HashMap<String,Object>();
 		PageInfo<Map<String,Object>> pageInfo = null;
 		try {
@@ -111,8 +116,10 @@ public class RegistrationController {
 				map.put("warehouseId", warehouseId);
 			}
 
-			map.put("orgId", request.getSession().getAttribute("orgId"));
-			
+			if (StringUtils.isNotBlank(orgId)) {
+				map.put("orgId", orgId);
+			}
+
 			if (null != startDate && !"".equals(startDate)) {
 				map.put("startDate", startDate);
 			}
@@ -146,10 +153,11 @@ public class RegistrationController {
 		@ApiImplicitParam(name = "houseId", value = "仓房id", paramType = "query"),
 		@ApiImplicitParam(name = "warehouseId", value = "货位id", paramType = "query"),
 		@ApiImplicitParam(name = "startDate", value = "开始时间", paramType = "query"),
-		@ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query")
+		@ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query"),
+		@ApiImplicitParam(name = "orgId", value = "组织机构ID", paramType = "query")
 	})
 	public PageInfo<Map<String,Object>> getSoybeanListPageInfo(HttpServletRequest request, Integer pageNum, Integer pageSize,
-			String houseId, String warehouseId, String startDate, String endDate){
+			String houseId, String warehouseId, String startDate, String endDate, String orgId){
 		Map<String,Object> map = new HashMap<String,Object>();
 		PageInfo<Map<String,Object>> pageInfo = null;
 		try {
@@ -160,7 +168,9 @@ public class RegistrationController {
 				map.put("warehouseId", warehouseId);
 			}
 			
-			map.put("orgId", request.getSession().getAttribute("orgId"));
+			if (StringUtils.isNotBlank(orgId)) {
+				map.put("orgId", orgId);
+			}
 			
 			if (null != startDate && !"".equals(startDate)) {
 				map.put("startDate", startDate);
@@ -195,10 +205,11 @@ public class RegistrationController {
 		@ApiImplicitParam(name = "houseId", value = "仓房id", paramType = "query"),
 		@ApiImplicitParam(name = "warehouseId", value = "货位id", paramType = "query"),
 		@ApiImplicitParam(name = "startDate", value = "开始时间", paramType = "query"),
-		@ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query")
+		@ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query"),
+		@ApiImplicitParam(name = "orgId", value = "组织机构ID", paramType = "query")
 	})
 	public PageInfo<Map<String,Object>> getRiceListPageInfo(HttpServletRequest request, Integer pageNum, Integer pageSize,
-			String houseId, String warehouseId, String startDate, String endDate){
+			String houseId, String warehouseId, String startDate, String endDate, String orgId){
 		Map<String,Object> map = new HashMap<String,Object>();
 		PageInfo<Map<String,Object>> pageInfo = null;
 		try {
@@ -208,9 +219,11 @@ public class RegistrationController {
 			if (null != warehouseId && !"".equals(warehouseId)) {
 				map.put("warehouseId", warehouseId);
 			}
-			
-			map.put("orgId", request.getSession().getAttribute("orgId"));
-			
+
+			if (StringUtils.isNotBlank(orgId)) {
+				map.put("orgId", orgId);
+			}
+
 			if (null != startDate && !"".equals(startDate)) {
 				map.put("startDate", startDate);
 			}
@@ -243,19 +256,22 @@ public class RegistrationController {
 		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
 		@ApiImplicitParam(name = "tankId", value = "油罐id", paramType = "query"),
 		@ApiImplicitParam(name = "startDate", value = "开始时间", paramType = "query"),
-		@ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query")
+		@ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query"),
+		@ApiImplicitParam(name = "orgId", value = "组织机构ID", paramType = "query")
 	})
 	public PageInfo<Map<String,Object>> getCrudeOilListPageInfo(HttpServletRequest request, Integer pageNum, Integer pageSize,
-			String tankId, String startDate, String endDate){
+			String tankId, String startDate, String endDate, String orgId){
 		Map<String,Object> map = new HashMap<String,Object>();
 		PageInfo<Map<String,Object>> pageInfo = null;
 		try {
 			if (null != tankId && !"".equals(tankId)) {
 				map.put("tankId", tankId);
 			}
-				
-			map.put("orgId", request.getSession().getAttribute("orgId"));
-			
+
+			if (StringUtils.isNotBlank(orgId)) {
+				map.put("orgId", orgId);
+			}
+
 			if (null != startDate && !"".equals(startDate)) {
 				map.put("startDate", startDate);
 			}
@@ -288,11 +304,12 @@ public class RegistrationController {
 			@ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query"),
 			@ApiImplicitParam(name = "zbr", value = "制表人", paramType = "query"),
 			@ApiImplicitParam(name = "shdw", value = "收货单位", paramType = "query"),
-			@ApiImplicitParam(name = "dwfzr", value = "单位负责人", paramType = "query")
+			@ApiImplicitParam(name = "dwfzr", value = "单位负责人", paramType = "query"),
+			@ApiImplicitParam(name = "orgId", value = "组织机构ID", paramType = "query")
 	})
 	public void  exportWheatListPageInfo(HttpServletResponse response,HttpServletRequest request,
 										 String houseId, String warehouseId, String startDate, String endDate,
-										 String zbr, String shdw, String dwfzr){
+										 String zbr, String shdw, String dwfzr, String orgId){
 		Map<String,Object> map = new HashMap<String,Object>();
 		try {
 			if (null != houseId && !"".equals(houseId)) {
@@ -302,7 +319,9 @@ public class RegistrationController {
 				map.put("warehouseId", warehouseId);
 			}
 
-			map.put("orgId", request.getSession().getAttribute("orgId"));
+			if (StringUtils.isNotBlank(orgId)) {
+				map.put("orgId", orgId);
+			}
 
 			if (null != startDate && !"".equals(startDate)) {
 				map.put("startDate", startDate);
@@ -348,11 +367,12 @@ public class RegistrationController {
 			@ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query"),
 			@ApiImplicitParam(name = "zbr", value = "制表人", paramType = "query"),
 			@ApiImplicitParam(name = "shdw", value = "收货单位", paramType = "query"),
-			@ApiImplicitParam(name = "dwfzr", value = "单位负责人", paramType = "query")
+			@ApiImplicitParam(name = "dwfzr", value = "单位负责人", paramType = "query"),
+			@ApiImplicitParam(name = "orgId", value = "组织机构ID", paramType = "query")
 	})
 	public void exportRiceListPageInfo(HttpServletResponse response,HttpServletRequest request,
 															String houseId, String warehouseId, String startDate, String endDate,
-									   String zbr, String shdw, String dwfzr ){
+									   String zbr, String shdw, String dwfzr, String orgId){
 		Map<String,Object> map = new HashMap<String,Object>();
 		try {
 			if (null != houseId && !"".equals(houseId)) {
@@ -362,7 +382,9 @@ public class RegistrationController {
 				map.put("warehouseId", warehouseId);
 			}
 
-			map.put("orgId", request.getSession().getAttribute("orgId"));
+			if (StringUtils.isNotBlank(orgId)) {
+				map.put("orgId", orgId);
+			}
 
 			if (null != startDate && !"".equals(startDate)) {
 				map.put("startDate", startDate);