修改字段

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireTeamListDto.java

@@ -26,5 +26,5 @@ public class FireTeamListDto {
     private String nodeType;
 
     @ApiModelProperty(value = "树节点id")
-    private Long id;
+    private Long nodeId;
 }

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

@@ -20,7 +20,6 @@ import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.feign.EquipFeignClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -87,7 +86,7 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
         });
         // 如果队伍下没有队伍则将自己加入返回列表
         if ("0".equals(team.getNodeType()) && !ValidationUtil.isEmpty(fireTeamList) && fireTeamList.size() > 1) {
-            fireTeamList = fireTeamList.stream().filter(t -> t.getSequenceNbr().equals(team.getId())).collect(Collectors.toList());
+            fireTeamList = fireTeamList.stream().filter(t -> t.getSequenceNbr().equals(team.getNodeId())).collect(Collectors.toList());
         }
         fireTeamListPage.setRecords(fireTeamList);
         return fireTeamListPage;