大屏修改2

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingenv/param/FeedingEnvPageParam.java

@@ -33,7 +33,7 @@ public class FeedingEnvPageParam {
     private String  orgId;
 
     /** 组织id */
-    @ApiModelProperty(value = "猪只类型")
+    @ApiModelProperty(value = "猪只类型",required = false)
     private String  type;
 
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingenv/service/impl/FeedingEnvServiceImpl.java

@@ -18,6 +18,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,7 +65,8 @@ public class FeedingEnvServiceImpl extends ServiceImpl<FeedingEnvMapper, Feeding
     @Override
     public List<FeedingEnv> page(FeedingEnvPageParam feedingEnvPageParam) {
         QueryWrapper<FeedingEnv> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("org_id", feedingEnvPageParam.getOrgId()).eq("type",feedingEnvPageParam.getType());
+        queryWrapper.eq("org_id", feedingEnvPageParam.getOrgId())
+                .eq(StringUtils.isNotBlank(feedingEnvPageParam.getType()),"type",feedingEnvPageParam.getType());
         List<FeedingEnv> feedingEnvs = envMapper.selectList(queryWrapper);
         return feedingEnvs;
     }