From b7844e3d3f28d608eb2d226e7d161828415f68cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Fri, 22 Dec 2023 23:35:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectUserinfoController.java | 4 +- .../service/ISurProjectUserinfoService.java | 2 +- .../impl/SurProjectUserinfoServiceImpl.java | 55 ++++++++++--------- 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java index 204d4f58..a9993b73 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java @@ -52,7 +52,7 @@ public class ProjectUserinfoController extends BaseController { * @return */ @GetMapping("/queryAllProjectUserByParams") - public AjaxResult queryAllProjectUserByParams(@RequestParam Long projectId, String loginName){ - return success(surProjectUserinfoService.queryAllProjectUserInfo(projectId,loginName)); + public AjaxResult queryAllProjectUserByParams(@RequestParam Long projectId, String loginName,String selectMy){ + return success(surProjectUserinfoService.queryAllProjectUserInfo(projectId,loginName,selectMy)); } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectUserinfoService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectUserinfoService.java index 6762bba7..32644e92 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectUserinfoService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectUserinfoService.java @@ -55,7 +55,7 @@ public interface ISurProjectUserinfoService * @param loginName 项目用户 * @return 项目用户集合 */ - public List queryAllProjectUserInfo(Long projectId, String loginName); + public List queryAllProjectUserInfo(Long projectId, String loginName, String selectMy); /** * 新增项目用户 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java index bc3b49e9..28a64702 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java @@ -11,6 +11,7 @@ import com.ruoyi.common.enums.PublicStateEnum; import com.ruoyi.common.enums.SysRoleEnum; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.mapper.SysDeptMapper; import com.ruoyi.system.mapper.SysRoleMapper; import com.ruoyi.system.mapper.SysUserMapper; @@ -138,7 +139,7 @@ public class SurProjectUserinfoServiceImpl implements ISurProjectUserinfoService * @return 项目用户集合 */ @Override - public List queryAllProjectUserInfo(Long projectId, String loginName) { + public List queryAllProjectUserInfo(Long projectId, String loginName,String selectMy) { String nowRole = Convert.toStr(sysRoleMapper.getUserMinRoleIdByLoginName(loginName)); //查询出公司信息 SurProjectUnitInfo surProjectUnitInfo = new SurProjectUnitInfo(); @@ -147,33 +148,37 @@ public class SurProjectUserinfoServiceImpl implements ISurProjectUserinfoService List projectUserList; SurProjectUserinfo surProjectUserinfo = new SurProjectUserinfo(); surProjectUserinfo.setProjectId(projectId); - surProjectUserinfo.setCreateBy(loginName); + if(!Objects.equals(PublicStateEnum.YES.getCode(),selectMy)){ + surProjectUserinfo.setCreateBy(loginName); + } //根据项目主键查询所有项目人员 projectUserList = surProjectUserinfoMapper.selectSurProjectUserinfoList(surProjectUserinfo); //根据角色查询项目单位人员信息 - if(SysRoleEnum.ADMIN.getCode().equals(nowRole) || SysRoleEnum.SUPR.getCode().equals(nowRole) || SysRoleEnum.JTGS.getCode().equals(nowRole) || SysRoleEnum.ZGS.getCode().equals(nowRole)){ - surProjectUserinfo.setRoleId(SysRoleEnum.ZGS.getCode()); - //查询所属项目部门信息 - SysDept sysDept = deptMapper.selectDeptByProjectId(projectId); - surProjectUserinfo.setDeptId(sysDept.getDeptId()); - }else if(SysRoleEnum.JLDW.getCode().equals(nowRole)){ - //监理单位只能选择监理单位 - surProjectUserinfo.setRoleId(SysRoleEnum.JLDW.getCode()); - //查询部门信息 - SysDept sysDept = deptMapper.selectDeptByUserName(loginName); - surProjectUserinfo.setDeptId(sysDept.getDeptId()); - }else if(SysRoleEnum.ZBDW.getCode().equals(nowRole)){ - //总包单位只能选择总包单位 - surProjectUserinfo.setRoleId(SysRoleEnum.ZBDW.getCode()); - //查询部门信息 - SysDept sysDept = deptMapper.selectDeptByUserName(loginName); - surProjectUserinfo.setDeptId(sysDept.getDeptId()); - }else if(SysRoleEnum.FBDW.getCode().equals(nowRole)){ - //分包单位只能选择分包单位 - surProjectUserinfo.setRoleId(SysRoleEnum.FBDW.getCode()); - //查询部门信息 - SysDept sysDept = deptMapper.selectDeptByUserName(loginName); - surProjectUserinfo.setDeptId(sysDept.getDeptId()); + if(Objects.equals(PublicStateEnum.YES.getCode(),selectMy)){ + if(SysRoleEnum.ADMIN.getCode().equals(nowRole) || SysRoleEnum.SUPR.getCode().equals(nowRole) || SysRoleEnum.JTGS.getCode().equals(nowRole) || SysRoleEnum.ZGS.getCode().equals(nowRole)){ + surProjectUserinfo.setRoleId(SysRoleEnum.ZGS.getCode()); + //查询所属项目部门信息 + SysDept sysDept = deptMapper.selectDeptByProjectId(projectId); + surProjectUserinfo.setDeptId(sysDept.getDeptId()); + }else if(SysRoleEnum.JLDW.getCode().equals(nowRole)){ + //监理单位只能选择监理单位 + surProjectUserinfo.setRoleId(SysRoleEnum.JLDW.getCode()); + //查询部门信息 + SysDept sysDept = deptMapper.selectDeptByUserName(loginName); + surProjectUserinfo.setDeptId(sysDept.getDeptId()); + }else if(SysRoleEnum.ZBDW.getCode().equals(nowRole)){ + //总包单位只能选择总包单位 + surProjectUserinfo.setRoleId(SysRoleEnum.ZBDW.getCode()); + //查询部门信息 + SysDept sysDept = deptMapper.selectDeptByUserName(loginName); + surProjectUserinfo.setDeptId(sysDept.getDeptId()); + }else if(SysRoleEnum.FBDW.getCode().equals(nowRole)){ + //分包单位只能选择分包单位 + surProjectUserinfo.setRoleId(SysRoleEnum.FBDW.getCode()); + //查询部门信息 + SysDept sysDept = deptMapper.selectDeptByUserName(loginName); + surProjectUserinfo.setDeptId(sysDept.getDeptId()); + } } //查询相关人员 List deptUserList = new ArrayList<>();