修改

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/inventoryUse/controller/InventoryUseController.java

@@ -167,7 +167,7 @@ public class InventoryUseController {
     public CommonResult<List<BaseConfig>> typeSelector(InventoryUseOrgIdParam inventoryUseOrgIdParam) {
         String orgId = inventoryUseOrgIdParam.getOrgId();
         BaseConfig baseConfig = baseConfigService.getOne(new QueryWrapper<BaseConfig>().lambda().eq(BaseConfig::getConfigName, "物资类别").eq(BaseConfig::getParentId, 0));
-        List<BaseConfig> baseConfigs = baseConfigService.list(new QueryWrapper<BaseConfig>().lambda().eq(BaseConfig::getParentId, baseConfig.getId()).eq(BaseConfig::getOrgId, orgId));
+        List<BaseConfig> baseConfigs = baseConfigService.list(new QueryWrapper<BaseConfig>().lambda().eq(BaseConfig::getParentId, baseConfig.getId()).eq(BaseConfig::getStatus,1).eq(BaseConfig::getOrgId, orgId));
         return CommonResult.data(baseConfigs);
     }
 
@@ -183,7 +183,7 @@ public class InventoryUseController {
     public CommonResult<List<BaseConfig>> warehouseSelector(InventoryUseOrgIdParam inventoryUseOrgIdParam) {
         String orgId = inventoryUseOrgIdParam.getOrgId();
         BaseConfig baseConfig = baseConfigService.getOne(new QueryWrapper<BaseConfig>().lambda().eq(BaseConfig::getConfigName, "仓库").eq(BaseConfig::getParentId, 0));
-        List<BaseConfig> baseConfigs = baseConfigService.list(new QueryWrapper<BaseConfig>().lambda().eq(BaseConfig::getParentId, baseConfig.getId()).eq(BaseConfig::getOrgId, orgId));
+        List<BaseConfig> baseConfigs = baseConfigService.list(new QueryWrapper<BaseConfig>().lambda().eq(BaseConfig::getStatus,1).eq(BaseConfig::getParentId, baseConfig.getId()).eq(BaseConfig::getOrgId, orgId));
         return CommonResult.data(baseConfigs);
     }
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/pigpen/controller/BasePigpenController.java

@@ -183,7 +183,7 @@ public class BasePigpenController {
     public CommonResult<List<BaseConfig>> typeSelector(BasePigpenOrgIdParam basePigpenOrgIdParam) {
         String orgId = basePigpenOrgIdParam.getOrgId();
         BaseConfig baseConfig = baseConfigService.getOne(new QueryWrapper<BaseConfig>().lambda().eq(BaseConfig::getConfigName, "栋舍阶段").eq(BaseConfig::getParentId, 0));
-        List<BaseConfig> baseConfigs = baseConfigService.list(new QueryWrapper<BaseConfig>().lambda().eq(BaseConfig::getParentId, baseConfig.getId()).eq(BaseConfig::getOrgId, orgId));
+        List<BaseConfig> baseConfigs = baseConfigService.list(new QueryWrapper<BaseConfig>().lambda().eq(BaseConfig::getStatus,1).eq(BaseConfig::getParentId, baseConfig.getId()).eq(BaseConfig::getOrgId, orgId));
         return CommonResult.data(baseConfigs);
     }
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energyDevice/service/impl/EnergyDeviceServiceImpl.java

@@ -205,7 +205,7 @@ public class EnergyDeviceServiceImpl extends ServiceImpl<EnergyDeviceMapper, Ene
     public List<BaseConfig> deviceTypeSelector(EnergyDeviceOrgIdParam energyDeviceOrgIdParam) {
         String orgId = energyDeviceOrgIdParam.getOrgId();
         String parentId = baseConfigMapper.selectOne(new QueryWrapper<BaseConfig>().lambda().eq(BaseConfig::getParentId, 0).eq(BaseConfig::getConfigName, "能耗设备类型")).getId();
-        List<BaseConfig> baseConfigs = baseConfigMapper.selectList(new QueryWrapper<BaseConfig>().lambda().eq(BaseConfig::getParentId, parentId).eq(BaseConfig::getOrgId, orgId));
+        List<BaseConfig> baseConfigs = baseConfigMapper.selectList(new QueryWrapper<BaseConfig>().lambda().eq(BaseConfig::getStatus,1).eq(BaseConfig::getParentId, parentId).eq(BaseConfig::getOrgId, orgId));
         return baseConfigs;
     }
 }