Merge remote-tracking branch 'origin/master'

hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java

@@ -180,13 +180,13 @@ public class MessageClient extends BladeController implements IMessageClient{
 	@PostMapping(SEND_SMS_IMMEDIATELY_MSG)
 	public R<Boolean> sendSmsImmediatelyMsg(@RequestBody SmsImmediatelyPushDTO smsImmediatelyPushDTO) {
 		try {
-			MessagePushRecordEntity record = BeanUtil.copy(smsImmediatelyPushDTO, MessagePushRecordEntity.class);
-			record.setMessageId(IdWorker.getId());
 			for (Long pushId : Func.toLongList(",", smsImmediatelyPushDTO.getPusher())) {
 				User user = UserCache.getUser(pushId);
 				if (ObjectUtil.isEmpty(user)||ObjectUtil.isEmpty(user.getPhone())){
 					continue;
 				}
+				MessagePushRecordEntity record = BeanUtil.copy(smsImmediatelyPushDTO, MessagePushRecordEntity.class);
+				record.setMessageId(IdWorker.getId());
 				record.setPusherName(user.getRealName());
 				record.setPusher(pushId.toString());
 				record.setPushType(MessageConstants.IMMEDIATELY);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java

@@ -176,12 +176,15 @@ public class ImsDutyGroupServiceImpl extends BaseServiceImpl<ImsDutyGroupMapper,
 				String name="";
 				for (int i1 = 0; i1 < userIds.size(); i1++) {
 					if(ObjectUtil.isNotEmpty(entity.getManagerId())&&!entity.getManagerId().equals(userIds.get(i1))){
-						name = name + UserCache.getUser(userIds.get(i1)).getRealName();
+						User user1 = UserCache.getUser(userIds.get(i1));
+						if (ObjectUtil.isNotEmpty(user1)&&StringUtils.isNotBlank(user1.getRealName())) {
+							name = name + user1.getRealName();
 							if (i1 != userIds.size() - 1) {
 								name = name + ",";
 							}
 						}
 					}
+				}
 				if (StringUtils.isNotBlank(name)) {
 					imsDutyGroupVO.setPersonName(name);
 				}