Merge branch 'han' of uskycloud/usky-modules into server-165

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/domain/BaseAlarmNoticeResult.java

@@ -75,5 +75,10 @@ public class BaseAlarmNoticeResult implements Serializable {
      */
     private Integer tenantId;
 
+    /**
+     * 接收人电话
+     */
+    private String receiverPhone;
+
 
 }

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/BaseAlarmServiceImpl.java

@@ -115,7 +115,8 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                                     .eq(SysUser::getDelFlag,0);
                             SysUser sysUser = sysUserMapper.selectOne(lambdaQuery4);
                             BaseAlarmNoticeResult baseAlarmNoticeResult = new BaseAlarmNoticeResult();
-                            baseAlarmNoticeResult.setReceiver(sysUser.getPhonenumber());
+                            baseAlarmNoticeResult.setReceiver(sysUser.getNickName());
+                            baseAlarmNoticeResult.setReceiverPhone(sysUser.getPhonenumber());
                             baseAlarmNoticeResult.setAlarmId(alarmId);
                             baseAlarmNoticeResult.setNoticeTime(LocalDateTime.now());
                             baseAlarmNoticeResult.setNoticeContent(records.get(0).getProductName()+","+baseAlarmType.getTypeName()+","+baseAlarm.getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd " +

service-alarm/service-alarm-biz/src/main/resources/mapper/alarm/BaseAlarmNoticeResultMapper.xml

@@ -14,6 +14,7 @@
         <result column="is_read" property="isRead" />
         <result column="dept_id" property="deptId" />
         <result column="tenant_id" property="tenantId" />
+        <result column="receiver_phone" property="receiverPhone" />
     </resultMap>
 
 </mapper>