Commit da193285 authored by hongguangwu's avatar hongguangwu

MVP1.7.7-项目

parent 3e18fa65
...@@ -81,6 +81,9 @@ public class TEmployeeProjectBelongDeptServiceImpl extends ServiceImpl<TEmployee ...@@ -81,6 +81,9 @@ public class TEmployeeProjectBelongDeptServiceImpl extends ServiceImpl<TEmployee
if (Common.isNotNull(tEmployeeProjectBelongDept.getEmpDeptId()) && !"-1".equals(tEmployeeProjectBelongDept.getEmpDeptId())) { if (Common.isNotNull(tEmployeeProjectBelongDept.getEmpDeptId()) && !"-1".equals(tEmployeeProjectBelongDept.getEmpDeptId())) {
tEmployeeProjectBelongDept.setEmpDeptIdArray(tEmployeeProjectBelongDept.getEmpDeptId().split(",")); tEmployeeProjectBelongDept.setEmpDeptIdArray(tEmployeeProjectBelongDept.getEmpDeptId().split(","));
} }
if (Common.isEmpty(tEmployeeProjectBelongDept.getEmpDeptId())) {
tEmployeeProjectBelongDept.setEmpDeptId("-2");
}
} }
/** /**
......
...@@ -36,9 +36,15 @@ ...@@ -36,9 +36,15 @@
<if test="tEmployeeProjectBelongDept.deptId != null and tEmployeeProjectBelongDept.deptId.trim() != ''"> <if test="tEmployeeProjectBelongDept.deptId != null and tEmployeeProjectBelongDept.deptId.trim() != ''">
AND a.DEPT_ID = #{tEmployeeProjectBelongDept.deptId} AND a.DEPT_ID = #{tEmployeeProjectBelongDept.deptId}
</if> </if>
<if test="tEmployeeProjectBelongDept.empDeptId != null and tEmployeeProjectBelongDept.empDeptId.trim() != '' <if test="tEmployeeProjectBelongDept.empDeptId != null and tEmployeeProjectBelongDept.empDeptId.trim() != ''">
and tEmployeeProjectBelongDept.empDeptId.trim() == '-1'"> <if test="tEmployeeProjectBelongDept.empDeptId.trim() == '-1'">
AND b.id is null /* 查询未关联的 */
AND b.id is null
</if>
<if test="tEmployeeProjectBelongDept.empDeptId.trim() == '-2'">
/* 查询空数据,前端zfl不愿意处理为不查,因为导出 */
AND b.id = '不要数据'
</if>
</if> </if>
<if test="tEmployeeProjectBelongDept.empName != null and tEmployeeProjectBelongDept.empName.trim() != ''"> <if test="tEmployeeProjectBelongDept.empName != null and tEmployeeProjectBelongDept.empName.trim() != ''">
AND a.EMP_NAME like concat('%',#{tEmployeeProjectBelongDept.empName},'%') AND a.EMP_NAME like concat('%',#{tEmployeeProjectBelongDept.empName},'%')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment