修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFirefightersService.java

@@ -36,4 +36,6 @@ public interface IFirefightersService {
     void saveFirefightersByUser(PeopleInfoDto firefighters);
 
     BigScreen1VO getFireForceInfoByCode(String companyCode);
+
+    String getCompanyName(String bizOrgCode);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java

@@ -329,4 +329,31 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 		bigScreen1VO.setUsrSignInfoByCode(usrSignInfoByBizOrgCode);
 		return bigScreen1VO;
 	}
+
+	@Override
+	public String getCompanyName(String bizOrgCode) {
+		LambdaQueryWrapper<OrgUsr> lambda = new QueryWrapper<OrgUsr>().lambda();
+		lambda.eq(OrgUsr::getBizOrgCode, bizOrgCode);
+		lambda.eq(OrgUsr::getIsDelete, false);
+		OrgUsr orgUsr = orgUsrMapper.selectList(lambda).get(0);
+		if (!ObjectUtils.isEmpty(orgUsr.getBizOrgType()) && "COMPANY".equals(orgUsr.getBizOrgType())) {
+			return orgUsr.getBizOrgName();
+		} else {
+			return getCompanyNameById(orgUsr.getParentId());
+		}
+
+	}
+
+	private String getCompanyNameById(String id) {
+		LambdaQueryWrapper<OrgUsr> lambda = new QueryWrapper<OrgUsr>().lambda();
+		lambda.eq(OrgUsr::getSequenceNbr, id);
+		lambda.eq(OrgUsr::getIsDelete, false);
+		OrgUsr orgUsr = orgUsrMapper.selectList(lambda).get(0);
+		if (!ObjectUtils.isEmpty(orgUsr.getBizOrgType()) && "COMPANY".equals(orgUsr.getBizOrgType())) {
+			return orgUsr.getBizOrgName();
+		} else {
+			return getCompanyNameById(orgUsr.getParentId());
+		}
+
+	}
 }

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

@@ -519,12 +519,13 @@ public class FirefightersController extends BaseController {
             firefightersQueryWrapper1.like("biz_org_code", bizOrgCode);
             firefightersQueryWrapper1.eq("people_type", "1601");
             firefightersQueryWrapper1.eq("is_delete", "0");
+            String companyName = iFirefightersService.getCompanyName(bizOrgCode);
             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("bizOrgName", companyName);
                 map.put("bizOrgCode", bizOrgCode);
                 map.put("amosUserId", e.getOrgUsrId());
                 map.put("personnelPhotos", e.getPersonnelPhotos());