后台查询修改

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/BaseDuckInfoServiceImpl.java

@@ -75,7 +75,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
     @Override
     public Result listDuck(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String chiNum = paramsMap.get("chiNum");//前端传来的是编号
-        String location = paramsMap.get("unitName");
+        String location = paramsMap.get("location");
         String farmId = paramsMap.get("farmId");//场的编码
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
@@ -86,8 +86,11 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
             pageSize = "10";
         }
         QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StringUtils.isNotBlank(location),"unit_name",location).like(StringUtils.isNotBlank(chiNum), "chi_num", chiNum).or().like(StringUtils.isNotBlank(chiNum), "jiao_num", chiNum)
-                .eq("farm_id", farmId).orderByDesc("id");
+        queryWrapper.eq("farm_id", farmId);
+        queryWrapper.like(StringUtils.isNotBlank(location),"unit_name",location)
+                .like(StringUtils.isNotBlank(chiNum), "chi_num", chiNum)
+                .or().like(StringUtils.isNotBlank(chiNum), "jiao_num", chiNum)
+                .orderByDesc("id");
         Page<BaseDuckInfo> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, duckInfoMapper.selectPage(page, queryWrapper));
     }