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/SalaryParamMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/server/src/main/resources/mappers/SalaryParamMapper.xml b/server/src/main/resources/mappers/SalaryParamMapper.xml
index 9ee4b05..30797f2 100644
--- a/server/src/main/resources/mappers/SalaryParamMapper.xml
+++ b/server/src/main/resources/mappers/SalaryParamMapper.xml
@@ -9,12 +9,14 @@
m.`NAME` as materialName,
m.`CODE` as materialCode,
p.`NAME` as procedureName,
- su.REALNAME as createUserName
+ su.REALNAME as createUserName,
+ d.name as departName
from
salary_param sp
LEFT JOIN procedures p on p.ID = sp.PROCEDURE_ID
LEFT JOIN material_distribute md on md.ID = sp.MATERIAL_ID
LEFT JOIN material m on m.ID = md.MATERIAL_ID
+ LEFT JOIN department d on sp.DEPART_ID= d.id
LEFT JOIN `system_user` su on su.ID = sp.CREATE_USER
where
sp.DELETED = 0
--
Gitblit v1.9.3