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/dao/system/model/SystemLoginLog.java | 5 +++++
server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java | 6 +++---
server/src/main/java/doumeemes/service/system/impl/SystemLoginLogServiceImpl.java | 5 ++++-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java b/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
index 804ee3a..709a3e6 100644
--- a/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
+++ b/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
@@ -83,4 +83,9 @@
@TableField(exist = false)
private String companyName;
+ @ApiModelProperty(value = "浼佷笟鐢ㄦ埛鍚嶇О")
+ @ExcelColumn(name="浼佷笟鍚嶇О", color = IndexedColors.RED, width = 16)
+ @TableField(exist = false)
+ private String companyUserName;
+
}
diff --git a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
index dbaafcf..dc253be 100644
--- a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
@@ -332,7 +332,7 @@
QueryWrapper<WarehouseLocation> warehouseLocationQuery = new QueryWrapper<>();
warehouseLocationQuery.lambda()
.eq(WarehouseLocation::getRootDepartId,department.getRootId())
- .eq(WarehouseLocation::getUnionName
+ .in(WarehouseLocation::getUnionName
,Arrays.asList(s.getFinishWarehouseLocationName(),s.getProduceWarehouseLocationName()));
if(Objects.equals(list.size(),2)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"搴撲綅淇℃伅宸插瓨鍦�");
@@ -361,8 +361,8 @@
device.setStationCode(s.getStationCode());
// device.setGroupId();
// device.setSerialNum();
- device.setProduceWarehouseLocationId(collect.get(s.getProduceWarehouseLocationName()).getId());
- device.setFinishWarehouseLocationId(collect.get(s.getFinishWarehouseLocationName()).getId());
+ device.setProduceWarehouseLocationId(Optional.ofNullable(collect.get(s.getProduceWarehouseLocationName())).map(m->m.getId()).orElse(null));
+ device.setFinishWarehouseLocationId(Optional.ofNullable(collect.get(s.getFinishWarehouseLocationName())).map(m->m.getId()).orElse(null));
deviceMapper.insert(device);
if(StringUtils.isNotBlank(s.getUserIds())){
this.dealDeviceUserId(Constants.ZERO,device.getUserIds().trim(),device.getId(),user);
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