From c5c6fa800cedd37cea0e3cc3e68df78b47ee2813 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 10:37:59 +0800
Subject: [PATCH] 111
---
server/src/main/resources/mappers/SalaryParamMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/server/src/main/resources/mappers/SalaryParamMapper.xml b/server/src/main/resources/mappers/SalaryParamMapper.xml
index 34d04dd..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
@@ -23,6 +25,8 @@
or m.`CODE` = #{model.keyWord})</if>
<if test="model.procedureName != null and model.procedureName != ''"> and p.`NAME` like concat('%',#{model.procedureName},'%')</if>
<if test="model.type != null"> and sp.`TYPE` = #{model.type}</if>
+ <if test="model.rootDepartId != null"> and sp.`ROOT_DEPART_ID` = #{model.rootDepartId}</if>
+ <if test="model.departId != null"> and sp.`DEPART_ID` = #{model.departId}</if>
order by sp.CREATE_TIME desc
</select>
</mapper>
--
Gitblit v1.9.3