From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
index af8d16d..5b03ed6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
@@ -66,6 +66,9 @@
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer create(MemberCard memberCard) {
LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(userInfo == null){
+ userInfo = memberCard.getLoginUserInfo();
+ }
if(Objects.isNull(memberCard.getMemberId())
|| StringUtils.isBlank(memberCard.getCode())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -137,8 +140,7 @@
*/
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
- public void updateByIdInBatch(List<MemberCard> memberCards,Integer type) {
- LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public void updateByIdInBatch(List<MemberCard> memberCards,Integer type,LoginUserInfo userInfo) {
if (CollectionUtils.isEmpty(memberCards)) {
return;
}
--
Gitblit v1.9.3