From 551710d6caeaf2e57ba37e2bc91b30879cc927e9 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Thu, 26 Oct 2023 10:37:09 +0800 Subject: [PATCH] 10/26 --- .../crm/biz/projectinformation/ProjectInformationMapper.java | 4 ++-- .../crm/biz/projectinformation/ProjectInformationRest.java | 4 ++-- .../biz/projectinformation/ProjectInformationService.java | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java index 2ee15f71..46b7fe4f 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java @@ -18,8 +18,8 @@ import java.util.Map; @Mapper public interface ProjectInformationMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from project_information") - List listAll(); + @Select("select * from project_information info join user_project up on up.projectSid =info.sid where userSid #{userSid}") + List listAll(@Param("userSid")String userSid); ProjectInformationVo getProjectBySid( @Param("sid") String sid); @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid left join user_project u on u.projectSid =p.sid where u.userSid=#{sid}") List getProjectByUserSid( @Param("sid") String sid); diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java index 4aba5548..8778150b 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java @@ -48,9 +48,9 @@ public class ProjectInformationRest implements ProjectInformationFeign { } @ApiOperation("查询全部") @GetMapping("/listAll") - public ResultBean> listAll() { + public ResultBean> listAll(@RequestHeader("token") String token) { ResultBean rb = ResultBean.fireFail(); - List list =ProjectInformationService.listAll(); + List list =ProjectInformationService.listAll(token); return rb.success().setData(list); } @ApiOperation("保存") diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java index a502932a..7b435e6e 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java @@ -104,8 +104,9 @@ public class ProjectInformationService extends MybatisBaseService listAll() { - List pagging = baseMapper.listAll(); + public List listAll(String token) { + SysUserVo sysUserVo=sysUserFeign.loginDetailsNew(token).getData(); + List pagging = baseMapper.listAll(sysUserVo.getSid()); for(ProjectInformationVo projectInformationVo:pagging){ BigDecimal balance=projectAccountService.getBalanceByProjectSid(projectInformationVo.getSid()).getData(); projectInformationVo.setBalance(balance);