修改 气瓶安全追溯系统，液化石油气瓶-气瓶信息，使用地市级账号登录系统，气瓶信息列表未进行过滤 的问题

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

@@ -9,11 +9,16 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.BaseUnitLicence;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.BaseUnitLicenceServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.TzBaseEnterpriseInfoServiceImpl;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -499,6 +504,19 @@ public class CylinderInfoController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "获取登陆人所在气瓶基本信息", notes = "获取登陆人所在气瓶基本信息")
 	public ResponseModel<IPage<CylinderInfoDto>> cyinderInfoList(@RequestParam(value = "pageNum") String pageNum,
 			@RequestParam(value = "pageSize") String pageSize, String sort, CylinderInfoDto cylinderInfoDto) {
+		FeignClientResult<AgencyUserModel> result1= Privilege.agencyUserClient.getme();
+		if(result1.getResult()!=null) {
+			List<CompanyModel> list = result1.getResult().getCompanys();
+			if (list != null && !list.isEmpty()) {
+				CompanyModel company = list.get(0);
+				if(company.getCompanyCode().length()>6) {
+					cylinderInfoDto.setCreditCode(company.getCompanyCode());
+				}
+			}
+		}
+		if(ValidationUtil.isEmpty(cylinderInfoDto.getRegionCode()) && ValidationUtil.isEmpty(cylinderInfoDto.getCreditCode())){
+			return ResponseHelper.buildResponse(new Page<CylinderInfoDto>(Long.valueOf(pageNum),Long.valueOf(pageSize)));
+		}
 		QueryWrapper<CylinderInfo> cylinderInfoQueryWrapper = new QueryWrapper<>();
 		if (StringUtils.isNotEmpty(cylinderInfoDto.getRegionCode())) {
 			List<String> appids = new ArrayList<>();
@@ -598,6 +616,9 @@ public class CylinderInfoController extends BaseController {
 		if (!ValidationUtil.isEmpty(cylinderInfo.getManufacturingUnit())) {// 制造单位
 			queryWrapper.like("manufacturing_unit", cylinderInfo.getManufacturingUnit());
 		}
+		if (!ValidationUtil.isEmpty(cylinderInfo.getCreditCode())) {// 统一社会信用代码
+			queryWrapper.like("credit_code", cylinderInfo.getCreditCode());
+		}
 		return queryWrapper;
 	}