From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug
---
server/src/main/resources/mappers/SalaryParamMapper.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/server/src/main/resources/mappers/SalaryParamMapper.xml b/server/src/main/resources/mappers/SalaryParamMapper.xml
index 45c8024..30797f2 100644
--- a/server/src/main/resources/mappers/SalaryParamMapper.xml
+++ b/server/src/main/resources/mappers/SalaryParamMapper.xml
@@ -9,18 +9,24 @@
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 m on m.ID = sp.MATERIAL_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
<if test="model.keyWord != null and model.keyWord != ''">
- ( and p`NAME` like concat('%',#{model.keyWord},'%')
- or p.`CODE` = #{model.keyWord})</if>
+ and ( m.`NAME` like concat('%',#{model.keyWord},'%')
+ 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