Commit ccc1ce03 authored by fangxinjiang's avatar fangxinjiang

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

parents 630736f9 df5dd480
...@@ -46,6 +46,7 @@ import java.time.LocalDate; ...@@ -46,6 +46,7 @@ import java.time.LocalDate;
import java.time.ZoneId; import java.time.ZoneId;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
/** /**
* 社保待购买表 * 社保待购买表
...@@ -136,6 +137,9 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap ...@@ -136,6 +137,9 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
public List<TDispatchInfoPre> getNoPageList(TDispatchInfoPreSearchVo searchVo) { public List<TDispatchInfoPre> getNoPageList(TDispatchInfoPreSearchVo searchVo) {
searchVo.setType(CommonConstants.ONE_STRING); searchVo.setType(CommonConstants.ONE_STRING);
initSearchVo(searchVo); initSearchVo(searchVo);
if (Common.isEmpty(searchVo.getStatusList())) {
searchVo.setStatusList(Stream.of("0").collect(Collectors.toList()));
}
return baseMapper.geNoPageList(searchVo); return baseMapper.geNoPageList(searchVo);
} }
......
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
<if test="tDispatchInfoPre.statusList != null and tDispatchInfoPre.statusList.size() > 0"> <if test="tDispatchInfoPre.statusList != null and tDispatchInfoPre.statusList.size() > 0">
AND a.process_status in AND a.process_status in
<foreach item="item" index="index" collection="tDispatchInfoPre.statusList" open="(" separator="," close=")"> <foreach item="item" index="index" collection="tDispatchInfoPre.statusList" open="(" separator="," close=")">
#{item} '${item}'
</foreach> </foreach>
</if> </if>
<if test="tDispatchInfoPre.empName != null and tDispatchInfoPre.empName.trim() != ''"> <if test="tDispatchInfoPre.empName != null and tDispatchInfoPre.empName.trim() != ''">
......
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