后台修改

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/BatchController.java

@@ -38,7 +38,7 @@ public class BatchController {
     public Result listAll(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         QueryWrapper<Batch> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId);
+        queryWrapper.eq("farm_id", farmId).eq("is_enable",0);
         List<Batch> batches = batchService.list(queryWrapper);
         return new Result(ResultCode.SUCCESS, batches);
     }

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

@@ -417,10 +417,10 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
                 breed.setUnitId(baseBuilding.getId());
                 breed.setUnitList(baseBuilding.getParentId() + "," + baseBuilding.getId());
                 breed.setFarmId(Integer.parseInt(farmId));
-                if ("雄鸭".equals(breed.getDuckSex())) {
+                if ("雄性".equals(breed.getDuckSex())) {
                     breed.setDuckSex("0");
                 }
-                if ("雄鸭".equals(breed.getDuckSex())) {
+                if ("雌性".equals(breed.getDuckSex())) {
                     breed.setDuckSex("1");
                 }
                 QueryWrapper<BaseDuckBreedImg> queryWrapper1 = new QueryWrapper<>();