Commit 4a48aafc authored by yanzhengyang's avatar yanzhengyang

出差申请根据登录用户显示相关数据

parent 4d48b976
...@@ -4,6 +4,8 @@ import lombok.Data; ...@@ -4,6 +4,8 @@ import lombok.Data;
@Data @Data
public class FyglTripApplicationVo { public class FyglTripApplicationVo {
//当前用户ID
private Long currentUserId;
//项目名称 //项目名称
private String projectName; private String projectName;
//项目类型 //项目类型
......
...@@ -40,6 +40,7 @@ public class FyglTripApplicationServiceImpl implements IFyglTripApplicationServi ...@@ -40,6 +40,7 @@ public class FyglTripApplicationServiceImpl implements IFyglTripApplicationServi
@Override @Override
public List<FyglTripApplicationDTO> selectFyglTripApplicationList(FyglTripApplicationVo favo){ public List<FyglTripApplicationDTO> selectFyglTripApplicationList(FyglTripApplicationVo favo){
favo.setCurrentUserId(SecurityUtils.getUserId());
List<FyglTripApplicationDTO> fyglTripApplications = fyglTripApplicationMapper.selectTripApplicationList(favo); List<FyglTripApplicationDTO> fyglTripApplications = fyglTripApplicationMapper.selectTripApplicationList(favo);
return fyglTripApplications; return fyglTripApplications;
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
LEFT JOIN project_manage p ON p.id = ftr.project_id LEFT JOIN project_manage p ON p.id = ftr.project_id
LEFT JOIN sys_user u1 ON u1.user_id = p.project_manager_id LEFT JOIN sys_user u1 ON u1.user_id = p.project_manager_id
<where> <where>
ftr.create_by in (select user_name from sys_user where user_id = #{currentUserId})
<if test="projectUserName != null and projectUserName != ''"> p.project_manager_id in (SELECT u5.user_id FROM sys_user u5 <if test="projectUserName != null and projectUserName != ''"> p.project_manager_id in (SELECT u5.user_id FROM sys_user u5
WHERE u5.nick_name LIKE CONCAT('%', #{projectUserName}, '%'))</if> WHERE u5.nick_name LIKE CONCAT('%', #{projectUserName}, '%'))</if>
<if test="projectType != null and projectType != ''"> and p.project_type = #{projectType}</if> <if test="projectType != null and projectType != ''"> and p.project_type = #{projectType}</if>
......
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