修改bug

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

@@ -610,11 +610,16 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
         List<String> confirmUser = new ArrayList<>();
         equipSpecificAlarmDTOList.forEach(e->confirmUser.add(e.getConfirmUser()));
         List<OrgUsrDto> result = jcsFeign.getByAmosId(confirmUser).getResult();
-        equipSpecificAlarmDTOList.stream().forEach(e->result.forEach(a->{
+        equipSpecificAlarmDTOList.stream().forEach(e->{
+                result.forEach(a->{
                     if (a.getAmosOrgId().equals(e.getConfirmUser())){
                         e.setJcsConfirmUserName(a.getBizOrgName());
                     }
-                }));
+                });
+            if (e.getJcsConfirmUserName() == null || e.getJcsConfirmUserName() == ""){
+                e.setJcsConfirmUserName(e.getConfirmUserName());
+            }
+        });
         return equipSpecificAlarmDTOList;
     }
 

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

@@ -1003,13 +1003,9 @@
     </select>
 
     <select id="getConfirmUser" resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog">
-        SELECT
-            distinct 	confirm_user,
-                        confirm_user_name
-        FROM
-            wl_equipment_specific_alarm_log
-        WHERE
-            confirm_user IS NOT NULL;
+
+        select *, count(distinct confirm_user) from  wl_equipment_specific_alarm_log  WHERE
+            confirm_user IS NOT NULL group by confirm_user
     </select>
 
     <select id="getbyqrCode" resultType="com.yeejoin.equipmanage.common.entity.dto.EquipSpecificAlarmDTO">