修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java

@@ -192,7 +192,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
     @RequestMapping(value = "/fireAlarmLogPage", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "消防报警列表分页查询", produces = "application/json;charset=UTF-8", notes = "消防报警列表分页查询")
-    public ResponseModel pageQuery(@RequestParam(required = false) String system, @RequestParam(required = false) String specificIndexKey, CommonPageable commonPageable) {
+    public ResponseModel pageQuery(@RequestParam(required = false) String code, @RequestParam(required = false) String typeCode, CommonPageable commonPageable) {
         if (commonPageable.getPageNumber() == 0) {
             commonPageable.setPageNumber(1);
         }
@@ -200,11 +200,11 @@ public class SupervisionConfigureController extends AbstractBaseController {
         List<CommonRequest> queryRequests = new ArrayList<>();
         CommonRequest request7 = new CommonRequest();
         request7.setName("system");
-        request7.setValue(StringUtil.isNotEmpty(system) ? StringUtils.trimToNull(system) : null);
+        request7.setValue(StringUtil.isNotEmpty(code) ? StringUtils.trimToNull(code) : null);
         queryRequests.add(request7);
         CommonRequest request8 = new CommonRequest();
         request8.setName("specificIndexKey");
-        request8.setValue(StringUtil.isNotEmpty(specificIndexKey) ? StringUtils.trimToNull(specificIndexKey) : null);
+        request8.setValue(StringUtil.isNotEmpty(typeCode) ? StringUtils.trimToNull(typeCode) : null);
         queryRequests.add(request8);
         if (!ValidationUtil.isEmpty(reginParams.getPersonIdentity())) {
             CommonRequest request13 = new CommonRequest();

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

@@ -1351,7 +1351,7 @@
                 find_in_set( #{param.system}, `wlesal`.`system_codes` )
             </if>
             <if test="param.fireEquipmentSpecificIndexKey != null and param.fireEquipmentSpecificIndexKey != ''">
-                AND wles.type = #{param.fireEquipmentSpecificIndexKey}
+                AND wlesal.type = #{param.fireEquipmentSpecificIndexKey}
             </if>
             <if test="param.bizOrgCode != null and param.bizOrgCode != ''">
                 AND wles.biz_org_code like concat (#{param.bizOrgCode},'%')