From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/resources/mappers/CompanyLogExtMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/src/main/resources/mappers/CompanyLogExtMapper.xml b/server/src/main/resources/mappers/CompanyLogExtMapper.xml
index 79c6f31..5563aef 100644
--- a/server/src/main/resources/mappers/CompanyLogExtMapper.xml
+++ b/server/src/main/resources/mappers/CompanyLogExtMapper.xml
@@ -7,13 +7,13 @@
SELECT
co.name as companyName,
su.REALNAME as updateUserName,
- dept.name AS shortName,
+ suc.REALNAME as createUserName,
cl.*
FROM
company_log cl
LEFT JOIN company co ON cl.COMPANY_ID = co.id
LEFT JOIN SYSTEM_USER su ON su.id = cl.UPDATE_USER
- left join department dept on dept.COMPANY_ID = co.ID and dept.PARENT_ID IS NULL AND dept.TYPE != 4
+ LEFT JOIN SYSTEM_USER suc ON suc.id = cl.UPDATE_USER
<where>
<if test="companyName != null and companyName != ''">
co.name LIKE CONCAT('%',#{companyName},'%')
@@ -25,4 +25,4 @@
order by cl.id desc
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3