Browse Source

审批清除消息异常处理

Signed-off-by: sunhz <mpcoo@foxmail.com>
sunhz 3 năm trước cách đây
mục cha
commit
b2beb636af

+ 1 - 4
blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditProecessServiceImpl.java

@@ -1475,10 +1475,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 		message.setToUserId(toUserId);
 		message.setParameter(String.valueOf(billId));
 
-		R save = messageClient.clean(message);
-		if (!save.isSuccess()) {
-			throw new SecurityException("清除消息失败");
-		}
+		messageClient.clean(message);
 	}
 
 }

+ 7 - 5
blade-service/blade-client/src/main/java/org/springblade/client/message/service/impl/MessageServiceImpl.java

@@ -172,11 +172,13 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
 	public void clean(Message message) {
 		List<Long> userIdList = message.getUserList();
 		userIdList.remove(message.getToUserId());
-		baseMapper.delete(new LambdaQueryWrapper<Message>()
-			.eq(Message::getParameter, message.getParameter())
-			.in(Message::getToUserId, userIdList)
-			.eq(Message::getOrigin, 1)
-		);
+		if (CollectionUtils.isNotEmpty(userIdList)) {
+			baseMapper.delete(new LambdaQueryWrapper<Message>()
+				.eq(Message::getParameter, message.getParameter())
+				.in(Message::getToUserId, userIdList)
+				.eq(Message::getOrigin, 1)
+			);
+		}
 	}
 
 }