Commit cac77a8a authored by wangzb's avatar wangzb

feature-wzb :bug修复

parent a1d3f6dd
...@@ -23,7 +23,7 @@ import java.util.List; ...@@ -23,7 +23,7 @@ import java.util.List;
public interface TEmployeeRetirementMapper extends BaseMapper<TEmployeeRetirement> { public interface TEmployeeRetirementMapper extends BaseMapper<TEmployeeRetirement> {
IPage<TEmployeeRetirement> getTEmployeeRetirementPage(Page page, @Param("searchVo") TEmployeeRetirementSearchVo searchVo); IPage<TEmployeeRetirement> getTEmployeeRetirementPage(Page page, @Param("userId") String userId,@Param("searchVo") TEmployeeRetirementSearchVo searchVo);
List<TEmployeeRetirement> getBirthday(@Param("oo") String oo, @Param("pp") String pp); List<TEmployeeRetirement> getBirthday(@Param("oo") String oo, @Param("pp") String pp);
......
...@@ -28,7 +28,6 @@ import org.springframework.stereotype.Service; ...@@ -28,7 +28,6 @@ import org.springframework.stereotype.Service;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
...@@ -50,7 +49,9 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper; ...@@ -50,7 +49,9 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
@Override @Override
public IPage<TEmployeeRetirement> getTEmployeeRetirementPage(Page page, TEmployeeRetirementSearchVo searchVo) { public IPage<TEmployeeRetirement> getTEmployeeRetirementPage(Page page, TEmployeeRetirementSearchVo searchVo) {
return baseMapper.getTEmployeeRetirementPage(page, searchVo); YifuUser user=SecurityUtils.getUser();
String userId = user.getId();
return baseMapper.getTEmployeeRetirementPage(page, userId,searchVo);
} }
......
...@@ -846,6 +846,7 @@ ...@@ -846,6 +846,7 @@
AND t2.CREATE_TIME = t1.CREATE_TIME AND t2.CREATE_TIME = t1.CREATE_TIME
WHERE WHERE
t1.CONTRACT_TYPE = '1' t1.CONTRACT_TYPE = '1'
t1.IN_USE='0'
) AS t ON t.EMP_ID = a.EMP_ID ) AS t ON t.EMP_ID = a.EMP_ID
LEFT JOIN sys_area a1 on a1.id=b.ID_PROVINCE LEFT JOIN sys_area a1 on a1.id=b.ID_PROVINCE
LEFT JOIN sys_area a2 on a2.id=b.ID_CITY LEFT JOIN sys_area a2 on a2.id=b.ID_CITY
...@@ -858,6 +859,7 @@ ...@@ -858,6 +859,7 @@
LEFT JOIN sys_area a9 on a9.id=a.SOCIAL_TOWN LEFT JOIN sys_area a9 on a9.id=a.SOCIAL_TOWN
<where> <where>
a.DELETE_FLAG = '0' a.DELETE_FLAG = '0'
<include refid="exportTEmployeeProject_where"/> <include refid="exportTEmployeeProject_where"/>
<if test="tEmployeeProject.authSql != null and tEmployeeProject.authSql.trim() != ''"> <if test="tEmployeeProject.authSql != null and tEmployeeProject.authSql.trim() != ''">
${tEmployeeProject.authSql} ${tEmployeeProject.authSql}
......
...@@ -153,7 +153,9 @@ ...@@ -153,7 +153,9 @@
<where> <where>
<include refid="tEmployeeRetirement_pageWhere"/> <include refid="tEmployeeRetirement_pageWhere"/>
</where> </where>
order by a.CREATE_TIME desc ORDER BY
field(a.HANDLE_FLAG,0,1) asc,
CREATE_TIME desc
</select> </select>
<select id="selectByEmpIdcard" resultType="Integer"> <select id="selectByEmpIdcard" resultType="Integer">
SELECT count(*) SELECT count(*)
......
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