消防队伍列表接口修改

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireTeamMapper.xml

@@ -31,7 +31,8 @@
         <if test='par.companyCode != null'>and a.company_code = #{par.companyCode}</if>
         <if test='par.name != null'>and a.name like concat('%', #{par.name}, '%')</if>
         <if test='par.nodeType != null and par.nodeType == "1"'>and a.company = #{par.id}</if>
-        <if test='par.nodeType != null and par.nodeType == "0"'>and a.parent = #{par.id}</if>
+        <if test='par.nodeType != null and par.nodeType == "0"'>and a.parent = #{par.id} or a.sequence_nbr =
+            #{par.id}</if>
     </select>
 
     <select id="listFireTeamDto" resultType="com.yeejoin.amos.boot.module.common.api.dto.FireTeamDto">

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

@@ -19,6 +19,7 @@ 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;
@@ -83,6 +84,9 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
                 t.setCarNum(finalTeamCarCountMap.get(t.getSequenceNbr().toString()).intValue());
             }
         });
+        if ("0".equals(team.getNodeType()) && !ValidationUtil.isEmpty(fireTeamList) && fireTeamList.size() > 1) {
+            fireTeamList = fireTeamList.stream().filter(t -> t.getSequenceNbr().equals(team.getId())).collect(Collectors.toList());
+        }
         fireTeamListPage.setRecords(fireTeamList);
         return fireTeamListPage;
     }