任务 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

@@ -504,11 +504,13 @@ public class FirefightersController extends BaseController {
     public ResponseModel<JSONObject> getPersons() {
         ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         if(null != reginParam) {
-            QueryWrapper<Firefighters> firefightersQueryWrapper = new QueryWrapper<>();
-            firefightersQueryWrapper.eq("amos_user_id",reginParam.getUserModel().getUserId());
-            Firefighters firePerson = iFirefightersService.getOne(firefightersQueryWrapper);
+            QueryWrapper<FireTeam> fireTeamQuery = new QueryWrapper<>();
+            fireTeamQuery.eq("biz_org_code",reginParam.getPersonIdentity().getBizOrgCode());
+            fireTeamQuery.eq("type_code","116");
+            fireTeamQuery.eq("is_delete","0");
+            FireTeam fireTeam = iFireTeamService.getOne(fireTeamQuery);
             QueryWrapper<Firefighters> firefightersQueryWrapper1 = new QueryWrapper<>();
-            firefightersQueryWrapper1.eq("fire_team_id",firePerson.getFireTeamId());
+            firefightersQueryWrapper1.eq("fire_team_id",fireTeam.getSequenceNbr());
             List<Firefighters> firefighters = iFirefightersService.getBaseMapper().selectList(firefightersQueryWrapper1);
             List<Map<String,Object>> list = new ArrayList<>();
             firefighters.stream().forEach(e->{