12168

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

@@ -213,12 +213,10 @@ public class SupervisionConfigureController extends AbstractBaseController {
         request8.setName("specificIndexKey");
         request8.setValue(StringUtil.isNotEmpty(typeCode) ? StringUtils.trimToNull(typeCode) : null);
         queryRequests.add(request8);
-        if (!ValidationUtil.isEmpty(reginParams.getPersonIdentity())) {
-            CommonRequest request13 = new CommonRequest();
-            request13.setName("bizOrgCode");
-            request13.setValue(StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null);
-            queryRequests.add(request13);
-        }
+        CommonRequest request13 = new CommonRequest();
+        request13.setName("bizOrgCode");
+        request13.setValue(ObjectUtils.isEmpty(bizOrgCode) ? reginParams.getPersonIdentity().getBizOrgCode() : bizOrgCode);
+        queryRequests.add(request13);
         CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
         return CommonResponseUtil.success(equipmentSpecificAlarmService.fireAlarmLogPage(param));
     }
@@ -240,11 +238,11 @@ public class SupervisionConfigureController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "概览稳压泵信息")
     @GetMapping("/getPressurePumpInfo")
-    public ResponseModel getPressurePumpInfo(CommonPageable commonPageable,@RequestParam(required = false) String bizOrgCode) {
+    public ResponseModel getPressurePumpInfo(CommonPageable commonPageable, @RequestParam(required = false) String bizOrgCode) {
         if (commonPageable.getPageNumber() == 0) {
             commonPageable.setPageNumber(1);
         }
-        if(ObjectUtils.isEmpty(bizOrgCode)){
+        if (ObjectUtils.isEmpty(bizOrgCode)) {
             ReginParams reginParams = getSelectedOrgInfo();
             ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
             if (!ValidationUtil.isEmpty(personIdentity)) {
@@ -335,7 +333,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
             boolean time = false;
             if (!ObjectUtils.isEmpty(stateMap) && stateMap.containsKey("update_date") && stateMap.containsKey("equipment_index_name")) {
                 item.put("update_time", String.valueOf(stateMap.get("update_date")).replaceAll("T", " "));
-                if(!ObjectUtils.isEmpty(stateMap.get("value"))){
+                if (!ObjectUtils.isEmpty(stateMap.get("value"))) {
                     item.put("equipment_index_name", stateMap.get("equipment_index_name"));
                 } else {
                     item.put("equipment_index_name", "无信号");

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

@@ -1385,7 +1385,7 @@
                 AND wlesal.type = #{param.fireEquipmentSpecificIndexKey}
             </if>
             <if test="param.bizOrgCode != null and param.bizOrgCode != ''">
-                AND wles.biz_org_code like concat (#{param.bizOrgCode},'%')
+                AND wlesal.biz_org_code like concat (#{param.bizOrgCode},'%')
             </if>
         </where>
         ORDER BY