Commit 070fb8cc authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7

parents 860d3802 865a05ed
......@@ -82,6 +82,9 @@ public class TEmployeeProjectBelongDeptServiceImpl extends ServiceImpl<TEmployee
if (Common.isNotNull(tEmployeeProjectBelongDept.getEmpDeptId()) && !"-1".equals(tEmployeeProjectBelongDept.getEmpDeptId())) {
tEmployeeProjectBelongDept.setEmpDeptIdArray(tEmployeeProjectBelongDept.getEmpDeptId().split(","));
}
if (Common.isEmpty(tEmployeeProjectBelongDept.getEmpDeptId())) {
tEmployeeProjectBelongDept.setEmpDeptId("不查数据");
}
}
/**
......
......@@ -41,6 +41,10 @@
/* 查询未关联的 */
AND b.id is null
</if>
<if test="tEmployeeProjectBelongDept.empDeptId.trim() == '不查数据'">
/* 不查数据 */
AND b.id = '不查数据'
</if>
</if>
<if test="tEmployeeProjectBelongDept.empName != null and tEmployeeProjectBelongDept.empName.trim() != ''">
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