任务 8612 任务 8695

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -511,23 +511,25 @@ public class FirefightersController extends BaseController {
             fireTeamQuery.eq("company",one.getCompany());
             fireTeamQuery.eq("type_code","116");
             fireTeamQuery.eq("is_delete","0");
-            List<FireTeam> fireTeam = iFireTeamService.list(fireTeamQuery);
-            QueryWrapper<Firefighters> firefightersQueryWrapper1 = new QueryWrapper<>();
+            List<FireTeam> fireTeamList = iFireTeamService.list(fireTeamQuery);
+
             List<Map<String,Object>> list = new ArrayList<>();
-            fireTeam.stream().forEach(r-> {
-                firefightersQueryWrapper1.eq("fire_team_id",r.getSequenceNbr());
+            for (FireTeam fireTeam :fireTeamList
+                 ) {
+                QueryWrapper<Firefighters> firefightersQueryWrapper1 = new QueryWrapper<>();
+                firefightersQueryWrapper1.eq("fire_team_id", fireTeam.getSequenceNbr());
                 List<Firefighters> firefighters = iFirefightersService.getBaseMapper().selectList(firefightersQueryWrapper1);
-                firefighters.stream().forEach(e->{
-                    Map<String,Object> map = new HashMap<>();
-                    map.put("name",e.getName());
-                    map.put("jobTitle",e.getJobTitle());
-                    map.put("bizOrgName",e.getBizOrgName());
-                    map.put("bizOrgCode",e.getBizOrgCode());
-                    map.put("amosUserId",e.getAmosUserId());
-                    map.put("personnelPhotos",e.getPersonnelPhotos());
+                firefighters.stream().forEach(e -> {
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("name", e.getName());
+                    map.put("jobTitle", e.getJobTitle());
+                    map.put("bizOrgName", e.getBizOrgName());
+                    map.put("bizOrgCode", e.getBizOrgCode());
+                    map.put("amosUserId", e.getAmosUserId());
+                    map.put("personnelPhotos", e.getPersonnelPhotos());
                     list.add(map);
                 });
-            });
+            }
 
             JSONObject object = new JSONObject();
             object.put("persons",list);