任务 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,8 +504,11 @@ 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> firefightersQueryWrapper2 = new QueryWrapper<>();
+            firefightersQueryWrapper2.eq("amos_user_id",reginParam.getUserModel().getUserId());
+            Firefighters one = iFirefightersService.getOne(firefightersQueryWrapper2);
             QueryWrapper<FireTeam> fireTeamQuery = new QueryWrapper<>();
-            fireTeamQuery.eq("biz_org_code",reginParam.getPersonIdentity().getBizOrgCode());
+            fireTeamQuery.eq("biz_org_code",one.getBizOrgCode());
             fireTeamQuery.eq("type_code","116");
             fireTeamQuery.eq("is_delete","0");
             FireTeam fireTeam = iFireTeamService.getOne(fireTeamQuery);