| | |
|---|
| | | //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】 |
|---|
| | | if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){ |
|---|
| | | dryEquipment.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0)); |
|---|
| | | //fix: shiro排除的接口无法从jwt获取tenantId |
|---|
| | | String tenantId = TokenUtils.getTenantIdByRequest(req); |
|---|
| | | if(StringUtils.isNotEmpty(tenantId)){ |
|---|
| | | dryEquipment.setTenantId(Integer.parseInt(tenantId)); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | //------------------------------------------------------------------------------------------------ |
|---|
| | | QueryWrapper<DryEquipment> queryWrapper = QueryGenerator.initQueryWrapper(dryEquipment, req.getParameterMap()); |
|---|
| | |
|---|
| | | DryEquipmentVo dryEquipmentVo = BeanUtil.toBean(item, DryEquipmentVo.class); |
|---|
| | | DryEqpType dryEqpType = dryEqpTypeService.getById(item.getType()); |
|---|
| | | if(dryEqpType == null){ |
|---|
| | | equipmentVos.add(dryEquipmentVo); |
|---|
| | | return; |
|---|
| | | } |
|---|
| | | dryEquipmentVo.setType(dryEqpType.getName()); |
|---|
