修改隔离畜种属于人

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillIsolatedServiceImpl.java

@@ -265,13 +265,8 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         isolation.setIsolatedPicUrl(content);
         isolation.setIsolatedSch(2);
 
+
         if ("1".equals(isDead)){
-            BillIsolated billIsolated = this.getById(id);
-            List<BaseAnimal> baseAnimals = baseAnimalMapper.selectList(new QueryWrapper<BaseAnimal>().eq("inspection_num", billIsolated.getInspectionNum()));
-            for (BaseAnimal baseAnimal : baseAnimals) {
-                baseAnimal.setAnimalStatus(1);
-                baseAnimalMapper.updateById(baseAnimal);
-            }
             isolation.setIsDead(1);
             isolation.setDeaths(deaths);
             if (deaths.contains(",")){
@@ -344,6 +339,11 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         }else {
             isolation.setIsDead(0);
         }
+        List<BaseAnimal> baseAnimals = baseAnimalMapper.selectList(new QueryWrapper<BaseAnimal>().eq("inspection_num", isolation.getInspectionNum()));
+        for (BaseAnimal baseAnimal : baseAnimals) {
+            baseAnimal.setAnimalStatus(1);
+            baseAnimalMapper.updateById(baseAnimal);
+        }
         BillLandingInspection billLandingInspection = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", isolation.getInspectionNum()));
         billLandingInspection.setReviewedTime(DateTime.now());
         billLandingInspection.setReviewed(TokenSign.getUserName(httpServletRequest));

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillSubsidyServiceImpl.java

@@ -302,7 +302,9 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
 //            return Result.SUCCESS();
 //        }
         if ("1".equals(type)) {
-            List<BaseAnimal> baseAnimals = baseAnimalMapper.selectList(new QueryWrapper<BaseAnimal>().eq("inspection_num", billSubsidy.getInspectionNum()));
+            List<BaseAnimal> baseAnimals = baseAnimalMapper.selectList(new QueryWrapper<BaseAnimal>()
+                    .eq("inspection_num", billSubsidy.getInspectionNum())
+                    .eq("belong_to_user",TokenSign.getMemberIdByJwtToken(httpServletRequest)));
             for (BaseAnimal baseAnimal : baseAnimals) {
                 baseAnimal.setIsLoated(0);
                 baseAnimalMapper.updateById(baseAnimal);