From 8f918cb6db02c39e67ce7b0d77cc1be5ed26edaf Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 25 八月 2023 11:03:28 +0800
Subject: [PATCH] # 企业端用户

---
 server/src/main/java/doumeemes/service/system/impl/SystemLoginLogServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/server/src/main/java/doumeemes/service/system/impl/SystemLoginLogServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/SystemLoginLogServiceImpl.java
index 8e83f1b..243a4d1 100644
--- a/server/src/main/java/doumeemes/service/system/impl/SystemLoginLogServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/SystemLoginLogServiceImpl.java
@@ -5,6 +5,7 @@
 import doumeemes.core.model.PageWrap;
 import doumeemes.core.utils.Utils;
 import doumeemes.dao.business.model.Company;
+import doumeemes.dao.business.model.CompanyUser;
 import doumeemes.dao.system.SystemLoginLogMapper;
 import doumeemes.dao.system.dto.QuerySystemLoginLogDTO;
 import doumeemes.dao.system.join.SystemLoginLogJoinMapper;
@@ -88,7 +89,7 @@
         Wrapper<SystemLoginLog> wrapper = new QueryWrapper<>(systemLoginLog);
         return systemLoginLogMapper.selectList(wrapper);
     }
-  
+
     @Override
     public PageData<SystemLoginLog> findPage(PageWrap<QuerySystemLoginLogDTO> pageWrap) {
         IPage<SystemLoginLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -96,7 +97,9 @@
         MPJLambdaWrapper<SystemLoginLog> mpjLambdaWrapper = new MPJLambdaWrapper<>();
         mpjLambdaWrapper.selectAll(SystemLoginLog.class);
         mpjLambdaWrapper.leftJoin(Company.class,Company::getId,SystemLoginLog::getCompanyId);
+        mpjLambdaWrapper.leftJoin(CompanyUser.class,CompanyUser::getId,SystemLoginLog::getCompanyUserId);
         mpjLambdaWrapper.selectAs(Company::getName, SystemLoginLog::getCompanyName);
+        mpjLambdaWrapper.selectAs(CompanyUser::getName, SystemLoginLog::getCompanyUserName);
         // 鐧诲綍鐢ㄦ埛鍚�
         if (StringUtils.isNotBlank(pageWrap.getModel().getLoginUsername())) {
             mpjLambdaWrapper.like(SystemLoginLog::getLoginUsername, pageWrap.getModel().getLoginUsername());

--
Gitblit v1.9.3