item：直流中心bug修改

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

@@ -613,17 +613,19 @@ public class FireFightingSystemController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "消防系统列表查询（不分页）", notes = "下拉使用")
     @GetMapping(value = "/list")
-    public List<FireFightingSystemEntity> listAll() {
+    public List<FireFightingSystemEntity> listAll(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode) {
+        if (StringUtils.isBlank(bizOrgCode)) {
             ReginParams reginParams = getSelectedOrgInfo();
             ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
             if (!ValidationUtil.isEmpty(personIdentity)) {
-            String bizOrgCode = personIdentity.getBizOrgCode();
+                bizOrgCode = personIdentity.getBizOrgCode();
+            }
+        }
         if (StringUtils.isNotBlank(bizOrgCode)) {
             QueryWrapper<FireFightingSystemEntity> qw = new QueryWrapper<>();
             qw.lambda().likeRight(FireFightingSystemEntity::getBizOrgCode, bizOrgCode);
             return fireFightingSystemService.list(qw);
         }
-        }
         return new ArrayList<>();
     }
 

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

@@ -5294,11 +5294,11 @@
                 FROM
                     `f_fire_fighting_system` `fs`
                         LEFT JOIN `wl_equipment_specific` `wes` ON 0 <![CDATA[<>]]> find_in_set( `fs`.`id`, `wes`.`system_id` )
-                        LEFT JOIN `wl_equipment_specific_index` `wesi` ON wesi.equipment_specific_id = wes.id
+                        LEFT JOIN `wl_equipment_specific_alarm` `wesi` ON wesi.equipment_specific_id = wes.id
                 WHERE
                     fs.system_type_code IS NOT NULL
                   AND fs.system_type_code = 'fireWaterSys'
-                  AND ( wesi.is_alarm = 1 AND wesi.`value` = 'true' OR wesi.is_alarm = 0 AND wesi.`value` = 'false' )
+                  AND ( wesi.`status` = 1 AND wesi.`equipment_specific_index_value` = 'true' OR wesi.`status` = 0 AND wesi.`equipment_specific_index_value` = 'false' )
             ) fireWaterSys,
             (
                 SELECT
@@ -5306,11 +5306,11 @@
                 FROM
                     `f_fire_fighting_system` `fs`
                         LEFT JOIN `wl_equipment_specific` `wes` ON 0 <![CDATA[<>]]> find_in_set( `fs`.`id`, `wes`.`system_id` )
-                        LEFT JOIN `wl_equipment_specific_index` `wesi` ON wesi.equipment_specific_id = wes.id
+                        LEFT JOIN `wl_equipment_specific_alarm` `wesi` ON wesi.equipment_specific_id = wes.id
                 WHERE
                     fs.system_type_code IS NOT NULL
                   AND fs.system_type_code = 'fireCAFSSys'
-                  AND ( wesi.is_alarm = 1 AND wesi.`value` = 'true' OR wesi.is_alarm = 0 AND wesi.`value` = 'false' )
+                  AND ( wesi.`status` = 1 AND wesi.`equipment_specific_index_value` = 'true' OR wesi.`status` = 0 AND wesi.`equipment_specific_index_value` = 'false' )
             ) fireCAFSSys,
             (
                 SELECT
@@ -5318,11 +5318,11 @@
                 FROM
                     `f_fire_fighting_system` `fs`
                         LEFT JOIN `wl_equipment_specific` `wes` ON 0 <![CDATA[<>]]> find_in_set( `fs`.`id`, `wes`.`system_id` )
-                        LEFT JOIN `wl_equipment_specific_index` `wesi` ON wesi.equipment_specific_id = wes.id
+                        LEFT JOIN `wl_equipment_specific_alarm` `wesi` ON wesi.equipment_specific_id = wes.id
                 WHERE
                     fs.system_type_code IS NOT NULL
                   AND fs.system_type_code = 'fireAlarmSys'
-                  AND ( wesi.is_alarm = 1 AND wesi.`value` = 'true' OR wesi.is_alarm = 0 AND wesi.`value` = 'false' )
+                  AND ( wesi.`status` = 1 AND wesi.`equipment_specific_index_value` = 'true' OR wesi.`status` = 0 AND wesi.`equipment_specific_index_value` = 'false' )
             ) fireAlarmSys,
             (
                 SELECT
@@ -5330,11 +5330,11 @@
                 FROM
                     `f_fire_fighting_system` `fs`
                         LEFT JOIN `wl_equipment_specific` `wes` ON 0 <![CDATA[<>]]> find_in_set( `fs`.`id`, `wes`.`system_id` )
-                        LEFT JOIN `wl_equipment_specific_index` `wesi` ON wesi.equipment_specific_id = wes.id
+                        LEFT JOIN `wl_equipment_specific_alarm` `wesi` ON wesi.equipment_specific_id = wes.id
                 WHERE
                     fs.system_type_code IS NOT NULL
                   AND fs.system_type_code = 'fireONLSys'
-                  AND ( wesi.is_alarm = 1 AND wesi.`value` = 'true' OR wesi.is_alarm = 0 AND wesi.`value` = 'false' )
+                  AND ( wesi.`status` = 1 AND wesi.`equipment_specific_index_value` = 'true' OR wesi.`status` = 0 AND wesi.`equipment_specific_index_value` = 'false' )
             ) fireONLSys
     </select>