|
@@ -33,7 +33,6 @@ import shop.alien.storeplatform.service.PlatformOperationLogService;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import shop.alien.storeplatform.service.StorePlatformRoleMenuService;
|
|
import shop.alien.storeplatform.service.StorePlatformRoleMenuService;
|
|
|
import shop.alien.storeplatform.service.StorePlatformRoleQueryService;
|
|
import shop.alien.storeplatform.service.StorePlatformRoleQueryService;
|
|
|
-import shop.alien.storeplatform.service.StorePlatformRoleService;
|
|
|
|
|
import shop.alien.storeplatform.util.LoginUserUtil;
|
|
import shop.alien.storeplatform.util.LoginUserUtil;
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
@@ -57,7 +56,6 @@ import java.util.stream.Collectors;
|
|
|
public class PlatformOperationLogAspect {
|
|
public class PlatformOperationLogAspect {
|
|
|
|
|
|
|
|
private final PlatformOperationLogService platformOperationLogService;
|
|
private final PlatformOperationLogService platformOperationLogService;
|
|
|
- private final StorePlatformRoleService storePlatformRoleService;
|
|
|
|
|
private final StorePlatformRoleMenuService storePlatformRoleMenuService;
|
|
private final StorePlatformRoleMenuService storePlatformRoleMenuService;
|
|
|
private final StorePlatformMenuMapper storePlatformMenuMapper;
|
|
private final StorePlatformMenuMapper storePlatformMenuMapper;
|
|
|
private final StoreUserMapper storeUserMapper;
|
|
private final StoreUserMapper storeUserMapper;
|
|
@@ -149,6 +147,10 @@ public class PlatformOperationLogAspect {
|
|
|
name = userInfo.getString("name");
|
|
name = userInfo.getString("name");
|
|
|
}
|
|
}
|
|
|
logRecord.setOperatorName(name);
|
|
logRecord.setOperatorName(name);
|
|
|
|
|
+ Integer storeId = LoginUserUtil.getCurrentStoreId();
|
|
|
|
|
+ if (storeId != null) {
|
|
|
|
|
+ logRecord.setStoreId(storeId);
|
|
|
|
|
+ }
|
|
|
String userType = userInfo.getString("userType");
|
|
String userType = userInfo.getString("userType");
|
|
|
logRecord.setUserType(StringUtils.hasText(userType) ? userType : "platform");
|
|
logRecord.setUserType(StringUtils.hasText(userType) ? userType : "platform");
|
|
|
}
|
|
}
|