*）修改装备全部导出报错

amos-boot-module/amos-boot-module-api/amos-boot-module-kgd-api/src/main/java/com/yeejoin/amos/kgd/service/impl/AnalysisResultServiceImpl.java

@@ -225,11 +225,11 @@ public class AnalysisResultServiceImpl extends ServiceImpl<AnalysisResultMapper,
         JSONArray deviceIds = map.getJSONArray("deviceIds");
         String samplingTime = map.getString("samplingTime");
         String analysisResult = map.getString("analysisResult");
-        if (ValidationUtil.isEmpty(deviceIds)){
-            throw new BadRequest("部件编码不能为空.");
-        }
 
         Page<AnalysisResult> page = new Page<>(size, size);
+        if (ValidationUtil.isEmpty(deviceIds)){
+            return page;
+        }
         LambdaQueryWrapper<AnalysisResult> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(AnalysisResult::getDeviceId, deviceIds);
         wrapper.isNotNull(AnalysisResult::getAnalysisResult);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java

@@ -289,11 +289,6 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
         return equipmentDetailMapper.getPref(id);
     }
 
-
-
-
-
-
     @Override
     public String checkDelete(List<Long> ids) {
         String res = "";
@@ -308,7 +303,6 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
 
     @Override
     public List<DetailssAmountVO> getall() {
-
         return equipmentDetailMapper.getall();
     }
 

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

@@ -182,7 +182,7 @@
 --             wlp.measure,
             wles.iot_code,
             wled.equipment_id,
-            wles.remark agencyName,
+            wles.agency_name agencyName,
             wled.equipment_name
             FROM
             wl_equipment_detail wled