修复bug2684

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireTeamServiceImpl.java

@@ -102,11 +102,21 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
         List<FireTeamCardDto> fireTeamList = fireTeamListPage.getRecords();
         Map<Object, Long> finalTeamCarCountMap = teamCarCountMap;
         fireTeamList.forEach(t -> {
-            if (!ValidationUtil.isEmpty(finalTeamCarCountMap.get(t.getSequenceNbr().toString()))) {
-                t.setCarNum(finalTeamCarCountMap.get(t.getSequenceNbr().toString()).intValue());
-                //递归查找全部战备人数 BUG2217 bykongfm
-                t.setFighterNum(getFightNumByTeamId(t.getSequenceNbr()));
+            //递归返回teamId bug2684 bykongfm
+            List<Long> teamIds = new ArrayList<Long>();
+            getAllTeamId(teamIds,t.getSequenceNbr());
+            int carNum = 0;
+            int fighterNum = 0;
+            for(Long tempId : teamIds ) {
+                if(finalTeamCarCountMap.get(tempId.toString()) != null) {
+                    carNum += finalTeamCarCountMap.get(tempId.toString()).intValue();
+                }
+                fighterNum += fireTeamMapper.getFighterNumByTeamId(tempId);
             }
+            t.setCarNum(carNum);
+            t.setFighterNum(fighterNum);
+            /*//递归查找全部战备人数 BUG2217 bykongfm
+            t.setFighterNum(getFightNumByTeamId(t.getSequenceNbr()));*/
         });
         fireTeamListPage.setRecords(fireTeamList);
         return fireTeamListPage;
@@ -316,4 +326,18 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
     }
 
 
+    public void getAllTeamId(List<Long> teamIds, Long teamId) {
+        teamIds.add(teamId);
+        LambdaQueryWrapper<FireTeam> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(FireTeam::getParent, teamId).eq(FireTeam::getIsDelete, false);
+        List<FireTeam> fireTeamList = this.list(queryWrapper);
+        if (fireTeamList.size() == 0) {
+            // 没有下级单位
+        } else {
+            for (FireTeam t : fireTeamList) {
+                getAllTeamId(teamIds, t.getSequenceNbr());
+            }
+        }
+    }
+
 }