修改bug
This commit is contained in:
parent
fab292eb6f
commit
65acd6e306
|
|
@ -207,7 +207,9 @@
|
||||||
where b.employee_id = #{employeeId}
|
where b.employee_id = #{employeeId}
|
||||||
and b.status = #{status}
|
and b.status = #{status}
|
||||||
and b.iz_history = #{izHistory}
|
and b.iz_history = #{izHistory}
|
||||||
|
<if test="applyType != null and applyType !=''">
|
||||||
and b.apply_type = #{applyType}
|
and b.apply_type = #{applyType}
|
||||||
|
</if>
|
||||||
order by b.create_time desc
|
order by b.create_time desc
|
||||||
limit 1
|
limit 1
|
||||||
</select>
|
</select>
|
||||||
|
|
|
||||||
|
|
@ -104,7 +104,7 @@ public class EmployeesApplyServiceImpl extends ServiceImpl<EmployeesApplyMapper,
|
||||||
usingEa.setEmployeeId(employeesApply.getEmployeeId());
|
usingEa.setEmployeeId(employeesApply.getEmployeeId());
|
||||||
usingEa.setStatus("1");
|
usingEa.setStatus("1");
|
||||||
usingEa.setIzHistory("N");
|
usingEa.setIzHistory("N");
|
||||||
usingEa.setApplyType("2");
|
// usingEa.setApplyType("2");
|
||||||
EmployeesApply modifyData = baseMapper.getModifyData(usingEa);
|
EmployeesApply modifyData = baseMapper.getModifyData(usingEa);
|
||||||
if (modifyData == null) {
|
if (modifyData == null) {
|
||||||
return Collections.emptyList();
|
return Collections.emptyList();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue