修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FireTeamMapper.java

@@ -98,5 +98,12 @@ public interface FireTeamMapper extends BaseMapper<FireTeam> {
 	 */
 	Integer getFighterNumByTeamId(Long teamId);
 
+	/**
+	 * 根据companyCode 返回机构下所有的队伍
+	 * @param teamId
+	 * @return
+	 */
+	List<FireTeam> byTeamId(Long teamId);
+
 
 }

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

@@ -150,6 +150,16 @@
 				AND is_delete = 0
     </select>
 
+    <select id="byTeamId" resultType="com.yeejoin.amos.boot.module.common.api.entity.FireTeam">
+        SELECT
+            *
+        FROM
+            cb_fire_team
+        WHERE
+            company_code = #{teamId}
+          AND is_delete = 0
+    </select>
+
 
 
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/ESAlertCalledDto.java

@@ -34,8 +34,14 @@ public class ESAlertCalledDto extends BaseDto {
     /**
      * 响应级别字典code 为了过滤用（只有航空器故障有）
      */
-    @ApiModelProperty(value = "响应级别")
+    @ApiModelProperty(value = "响应级别code")
     private String responseLevelCode;
+
+    /**
+     * 响应级别字典名称 为了过滤用（只有航空器故障有）
+     */
+    @ApiModelProperty(value = "响应级别")
+    private String responseLevel;
     /**
      * 警情阶段
      */

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -106,12 +106,12 @@ public class OrgUsrController extends BaseController {
         OrgUsr tempOrg = iOrgUsrService.getById(id.toString());
         if(tempOrg.getBizOrgType().equals("COMPANY") || tempOrg.getBizOrgType().equals("DEPARTMENT")) {
             List<OrgUsr> tempList = iOrgUsrService.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getParentId,id).eq(OrgUsr::getIsDelete,false));
-            /*bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-09 start*/
-            List<FireTeam> fireTeams = fireTeamMapper.listFireTeamById(id);
+            /*bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-13 start*/
+            List<FireTeam> fireTeams = fireTeamMapper.byTeamId(id);
             if(tempList.size() > 0 || fireTeams.size() > 0 ) {
                 return ResponseHelper.buildResponse("-1");
             }
-            /*bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-09 end*/
+            /*bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-13 end*/
         }
         //bug 2882 判断是否为部门 如果部门底下有人员不可直接删除 chenzhao 2021-09-27 end
 //        iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));