修改bug

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

@@ -257,6 +257,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 					//删除cb_org_usr_agency_user中对应数据
 					if (!ValidationUtil.isEmpty(orgUsrAgencyUser)) {
 						orgUsrAgencyUserMapper.delete(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id));
+						// 删除已经创建的管理员账号
 						Privilege.agencyUserClient.multDeleteUser(orgUsrAgencyUser.getAmosUserId());
 					}
 					//删除cb_org_usr相关字段

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -1479,7 +1479,7 @@
                                                    date_format( `other`.`create_date`, '%Y-%m-%d' ) = `weekUtil`.`click_date`
                                                )
                                 AND (
-                                               `other`.`equipment_specific_index_name` NOT IN ( 'SHIELD', 'BREAKDOWN', 'FIREALARM' )))))
+                                               `other`.`type` NOT IN ( 'SHIELD', 'BREAKDOWN', 'FIREALARM' )))))
                     GROUP BY
                         `weekUtil`.`click_date`
                     ORDER BY