监管所无法查看气瓶相关信息

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderInfoController.java

@@ -621,10 +621,12 @@ public class CylinderInfoController extends BaseController {
         }
 		CompanyModel companyModel = reginParams.getUserModel().getCompanys().get(0);
 		String companyCode = companyModel.getCompanyCode();
-		if("company".equals(companyModel.getLevel())){
+		if ("organization".equals(companyModel.getLevel())) {
+			return ResponseHelper.buildResponse(null);
+		} else if ("company".equals(companyModel.getLevel())) {
 			cylinderInfoDto.setCreditCode(companyCode);
 		}
-        if (ValidationUtil.isEmpty(cylinderInfoDto.getRegionCode()) && ValidationUtil.isEmpty(cylinderInfoDto.getCreditCode()) && cylinderInfoDto.getIsWarn() == 0) {
+		if (ValidationUtil.isEmpty(cylinderInfoDto.getRegionCode()) && ValidationUtil.isEmpty(cylinderInfoDto.getCreditCode()) && cylinderInfoDto.getIsWarn() == 0) {
 			return ResponseHelper.buildResponse(new Page<ESCylinderInfoDto>());
         }
         Page<ESCylinderInfoDto> pageResult = cylinderInfoServiceImpl.queryByKeys(cylinderInfoDto, pageNum, pageSize);
@@ -694,10 +696,12 @@ public class CylinderInfoController extends BaseController {
         }
 		CompanyModel companyModel = reginParams.getUserModel().getCompanys().get(0);
 		String companyCode = companyModel.getCompanyCode();
-		if("company".equals(companyModel.getLevel())){
+		if ("organization".equals(companyModel.getLevel())) {
+			return ResponseHelper.buildResponse(null);
+		} else if ("company".equals(companyModel.getLevel())) {
 			esCylinderFillingRecordDto.setCreditCode(companyCode);
 		} else {
-			esCylinderFillingRecordDto.setRegionCode("organization".equals(companyModel.getLevel()) ? null : companyCode);
+			esCylinderFillingRecordDto.setRegionCode(companyCode);
 		}
 
         Page<ESCylinderFillingRecordDto> pageResult = cylinderFillingRecordServiceImpl.queryByKeys(esCylinderFillingRecordDto, pageNum, pageSize);