智能仓房-通风计划-已审批通风计划同orgId下均可见；

src/main/java/com/chinaitop/depot/intelligent/ventilation/controller/AerationTaskController.java

@@ -49,13 +49,15 @@ public class AerationTaskController {
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
             @ApiImplicitParam(name = "state", value = "通风状态", paramType = "query")
     })
-    public ResponseEntity<PageInfo<TJobApplication>> getList(Integer pageNum, Integer pageSize, TJobApplication tJobApplication , Integer approvalState,Integer userId) {
+    public ResponseEntity<PageInfo<TJobApplication>> getList(Integer pageNum, Integer pageSize, TJobApplication tJobApplication , Integer approvalState,Integer userId,Integer orgId) {
         List<TJobApplication> list = null;
         try {
             if (null != pageNum && null != pageSize) {
                 PageHelper.startPage(pageNum, pageSize);
             }
-            list = aerationTaskService.getList(tJobApplication,approvalState,userId);
+            if (orgId != null) {
+                list = aerationTaskService.getList(tJobApplication,approvalState,userId,orgId);
+            }
         } catch (Exception e) {
             e.printStackTrace();
             ResponseEntity.failed(e.getMessage());

src/main/java/com/chinaitop/depot/intelligent/ventilation/service/AerationTaskService.java

@@ -10,7 +10,7 @@ public interface AerationTaskService {
 
 	Map<String, String> save(String taskApplyJson, Integer orgId);
 
-	List<TJobApplication> getList(TJobApplication tJobApplication, Integer approvalState,Integer userId);
+	List<TJobApplication> getList(TJobApplication tJobApplication, Integer approvalState,Integer userId,Integer orgId);
 
 	void submit(String id, Integer approvalStatus);
 

src/main/java/com/chinaitop/depot/intelligent/ventilation/service/impl/AerationTaskServiceImpl.java

@@ -29,7 +29,7 @@ public class AerationTaskServiceImpl implements AerationTaskService {
 	 * 列表
 	 */
 	@Override
-	public List<TJobApplication> getList(TJobApplication tJobApplication, Integer approvalState,Integer userId) {
+	public List<TJobApplication> getList(TJobApplication tJobApplication, Integer approvalState,Integer userId,Integer orgId) {
 		// TODO Auto-generated method stub
 		TJobApplicationExample tJobApplicationExample = new TJobApplicationExample();
 		tJobApplicationExample.setDistinct(true);
@@ -43,12 +43,14 @@ public class AerationTaskServiceImpl implements AerationTaskService {
         if(tJobApplication.getAreationPlanNumber()!=null){ //通风记录新增时 ，只通过计划编号获取仓房编号，不做其他操作
         	criteria.andAreationPlanNumberEqualTo(tJobApplication.getAreationPlanNumber());
         }else{
-        	if(userId!=null){
-        		criteria.andAidEqualTo(String.valueOf(userId));
-        	}
+
         	if(null != approvalState && approvalState==4){//审批结束：4
         		criteria.andStateEqualTo(4);
+				criteria.andOrgIdEqualTo(orgId);
         	}else{
+				if(userId!=null){
+					criteria.andAidEqualTo(String.valueOf(userId));
+				}
         		criteria.andStateNotEqualTo(4);
         	}
         }