From 2359a38efc2a90a2776e2a45afcecda1fb0065a3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 18 九月 2023 16:31:35 +0800
Subject: [PATCH] 111
---
server/src/main/resources/mappers/SystemUserMapper.xml | 3 ++-
server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java
index 011621d..65607da 100644
--- a/server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java
@@ -416,6 +416,7 @@
wTransferDetail.setTransferId(wTransfer.getId());
wTransferDetail.setOutDepartId(wTransfer.getOutDepartId());
wTransferDetail.setOutWarehouseId(wTransfer.getOutWarehouseId());
+ wTransferDetail.setOutLocationId(w.getOutLocationId());
wTransferDetail.setInDepartId(wTransfer.getInDepartId());
wTransferDetail.setInWarehouseId(wTransfer.getInWarehouseId());
wTransferDetail.setInLcoationId(w.getInLocationId());
diff --git a/server/src/main/resources/mappers/SystemUserMapper.xml b/server/src/main/resources/mappers/SystemUserMapper.xml
index 80066dd..57d6361 100644
--- a/server/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/src/main/resources/mappers/SystemUserMapper.xml
@@ -97,10 +97,11 @@
FROM `system_login_log` s left join company c on s.COMPANY_ID = c.ID
<where>
s.COMPANY_ID is not null
+ and s.SUCCESS = 1
+ and s.ORGIN is not null
<if test="dto.orgin != null">
AND s.orgin = #{dto.orgin}
</if>
-
<if test="dto.companyName != null and dto.companyName != ''">
AND c.`NAME` LIKE CONCAT('%', #{dto.companyName}, '%')
</if>
--
Gitblit v1.9.3